From d73aaf036096de298fc093a960b173d83a285fef Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Wed, 30 Oct 2024 10:14:42 +0100 Subject: [PATCH] KTIJ-31786 [kotlin] Rename `AbstractFirJvmOptimizeImportsTest` -> `AbstractK2JvmOptimizeImportsTest` (cherry picked from commit b45b25ad2b7d6fbde4b9ac8d2a814261e378d38c) IJ-CR-149236 GitOrigin-RevId: b131ffc11bb83186116ee9f93a29f4eb8aafcc3e --- ....kt => AbstractK2JvmOptimizeImportsTest.kt} | 2 +- ... => K2JvmOptimizeImportsTestGenerated.java} | 18 +++++++++--------- .../fir/testGenerator/FirGenerateTests.kt | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) rename plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/{AbstractFirOptimizeImportsTest.kt => AbstractK2JvmOptimizeImportsTest.kt} (95%) rename plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/{FirJvmOptimizeImportsTestGenerated.java => K2JvmOptimizeImportsTestGenerated.java} (98%) diff --git a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/AbstractFirOptimizeImportsTest.kt b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/AbstractK2JvmOptimizeImportsTest.kt similarity index 95% rename from plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/AbstractFirOptimizeImportsTest.kt rename to plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/AbstractK2JvmOptimizeImportsTest.kt index 16de23bb73c3..e562dfddc034 100644 --- a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/AbstractFirOptimizeImportsTest.kt +++ b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/AbstractK2JvmOptimizeImportsTest.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractFirJvmOptimizeImportsTest : AbstractImportsTest() { +abstract class AbstractK2JvmOptimizeImportsTest : AbstractImportsTest() { override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.getInstanceFullJdk() diff --git a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/K2JvmOptimizeImportsTestGenerated.java similarity index 98% rename from plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java rename to plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/K2JvmOptimizeImportsTestGenerated.java index ea44540f716e..cb5fc5f23334 100644 --- a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java +++ b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/K2JvmOptimizeImportsTestGenerated.java @@ -18,13 +18,13 @@ import org.junit.runner.RunWith; @TestRoot("fir/tests") @TestDataPath("$CONTENT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public abstract class FirJvmOptimizeImportsTestGenerated extends AbstractFirJvmOptimizeImportsTest { +public abstract class K2JvmOptimizeImportsTestGenerated extends AbstractK2JvmOptimizeImportsTest { @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/jvm") - public abstract static class Jvm extends AbstractFirJvmOptimizeImportsTest { + public abstract static class Jvm extends AbstractK2JvmOptimizeImportsTest { @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/jvm/allUnderImports") - public static class AllUnderImports extends AbstractFirJvmOptimizeImportsTest { + public static class AllUnderImports extends AbstractK2JvmOptimizeImportsTest { @java.lang.Override @org.jetbrains.annotations.NotNull public final KotlinPluginMode getPluginMode() { @@ -148,7 +148,7 @@ public abstract class FirJvmOptimizeImportsTestGenerated extends AbstractFirJvmO @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/jvm") - public static class Uncategorized extends AbstractFirJvmOptimizeImportsTest { + public static class Uncategorized extends AbstractK2JvmOptimizeImportsTest { @java.lang.Override @org.jetbrains.annotations.NotNull public final KotlinPluginMode getPluginMode() { @@ -343,10 +343,10 @@ public abstract class FirJvmOptimizeImportsTestGenerated extends AbstractFirJvmO @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/common") - public abstract static class Common extends AbstractFirJvmOptimizeImportsTest { + public abstract static class Common extends AbstractK2JvmOptimizeImportsTest { @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/common/basic") - public static class Basic extends AbstractFirJvmOptimizeImportsTest { + public static class Basic extends AbstractK2JvmOptimizeImportsTest { @java.lang.Override @org.jetbrains.annotations.NotNull public final KotlinPluginMode getPluginMode() { @@ -445,7 +445,7 @@ public abstract class FirJvmOptimizeImportsTestGenerated extends AbstractFirJvmO @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/common/kDoc") - public static class KDoc extends AbstractFirJvmOptimizeImportsTest { + public static class KDoc extends AbstractK2JvmOptimizeImportsTest { @java.lang.Override @org.jetbrains.annotations.NotNull public final KotlinPluginMode getPluginMode() { @@ -469,7 +469,7 @@ public abstract class FirJvmOptimizeImportsTestGenerated extends AbstractFirJvmO @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/common/kt21515") - public static class Kt21515 extends AbstractFirJvmOptimizeImportsTest { + public static class Kt21515 extends AbstractK2JvmOptimizeImportsTest { @java.lang.Override @org.jetbrains.annotations.NotNull public final KotlinPluginMode getPluginMode() { @@ -508,7 +508,7 @@ public abstract class FirJvmOptimizeImportsTestGenerated extends AbstractFirJvmO @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../idea/tests/testData/editor/optimizeImports/common") - public static class Uncategorized extends AbstractFirJvmOptimizeImportsTest { + public static class Uncategorized extends AbstractK2JvmOptimizeImportsTest { @java.lang.Override @org.jetbrains.annotations.NotNull public final KotlinPluginMode getPluginMode() { diff --git a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/FirGenerateTests.kt b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/FirGenerateTests.kt index bb4118cd9fb9..86db4d1c3424 100644 --- a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/FirGenerateTests.kt +++ b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/FirGenerateTests.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.fir.documentation.AbstractFirQuickDocTest import org.jetbrains.kotlin.idea.fir.externalAnnotations.AbstractK2ExternalAnnotationTest import org.jetbrains.kotlin.idea.fir.findUsages.* import org.jetbrains.kotlin.idea.fir.folding.AbstractFirFoldingTest -import org.jetbrains.kotlin.idea.fir.imports.AbstractFirJvmOptimizeImportsTest +import org.jetbrains.kotlin.idea.fir.imports.AbstractK2JvmOptimizeImportsTest import org.jetbrains.kotlin.idea.fir.imports.AbstractK2AutoImportTest import org.jetbrains.kotlin.idea.fir.imports.AbstractK2FilteringAutoImportTest import org.jetbrains.kotlin.idea.fir.kmp.AbstractK2KmpLightFixtureHighlightingTest @@ -214,7 +214,7 @@ private fun assembleWorkspace(): TWorkspace = workspace(KotlinPluginMode.K2) { ) } - testClass { + testClass { model("editor/optimizeImports/jvm", pattern = KT_WITHOUT_DOTS) model("editor/optimizeImports/common", pattern = KT_WITHOUT_DOTS) }