From a026b75e42a8fe29c4c8675ff8d42354cc1688f1 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Thu, 9 Dec 2021 18:04:17 +0700 Subject: [PATCH] [kotlin] rename some tests to hit the right test buckets GitOrigin-RevId: c506efa2117b9b7bf664445ecffc170a6cee16b3 --- .../test/handlers/BasicCompletionHandlerTest.kt | 2 +- .../AssociateCompilationImportAndHighlightingTest.kt | 2 +- .../kotlin/gradle/GradleMultiplatformHighlightingTest.kt | 2 +- .../kotlin/gradle/HmppImportAndHighlightingTests.kt | 6 +++--- .../codeInsight/gradle/GradleBuildFileHighlightingTest.kt | 2 +- .../gradle/GradleConfiguratorPlatformSpecificTest.kt | 4 ++-- .../idea/codeInsight/gradle/GradleConfiguratorTest.kt | 4 ++-- .../idea/codeInsight/gradle/GradleFacetImportTest.kt | 2 +- .../gradle/GradleMppNoJvmRunConfigurationProducersTest.kt | 2 +- .../kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt | 8 ++++---- .../konan/gradle/GradleNativeLibrariesPropagationTest.kt | 2 +- .../kotlin/asJava/LightClassesClasspathSortingTest.kt | 2 +- .../kotlin/idea/maven/AbstractKotlinMavenImporterTest.kt | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt b/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt index a10e4bc362fb..9242f68893cd 100644 --- a/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt +++ b/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt @@ -13,7 +13,7 @@ import org.junit.runner.RunWith @TestRoot("completion/tests/testData") @TestMetadata("handlers") @RunWith(JUnit38ClassRunner::class) -class BasicCompletionHandlerTest : CompletionHandlerTestBase() { +class BasicCompletionHandlerTest13 : CompletionHandlerTestBase() { private fun checkResult() { fixture.checkResultByFile(getTestName(false) + ".kt.after") } diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/AssociateCompilationImportAndHighlightingTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/AssociateCompilationImportAndHighlightingTest.kt index 5e803b93fa82..e392f719900e 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/AssociateCompilationImportAndHighlightingTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/AssociateCompilationImportAndHighlightingTest.kt @@ -6,7 +6,7 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.facetSettings import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions import org.junit.Test -class AssociateCompilationImportAndHighlightingTest : MultiplePluginVersionGradleImportingTestCase() { +class AssociateCompilationImportAndHighlightingTest01 : MultiplePluginVersionGradleImportingTestCase() { @Test @PluginTargetVersions(pluginVersion = "1.4+") diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt index c33c0765462b..1ae120e20b3c 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt @@ -34,7 +34,7 @@ import org.junit.Test import java.io.File abstract class GradleMultiplatformHighlightingTest : MultiplePluginVersionGradleImportingTestCase() { - class First : GradleMultiplatformHighlightingTest() { + class First1 : GradleMultiplatformHighlightingTest() { @Test @PluginTargetVersions(pluginVersion = "1.3.0+") fun testFirst() { diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/HmppImportAndHighlightingTests.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/HmppImportAndHighlightingTests.kt index 05492f6ab2db..9cee7f7f8534 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/HmppImportAndHighlightingTests.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/HmppImportAndHighlightingTests.kt @@ -27,7 +27,7 @@ abstract class HmppImportAndHighlightingTests : MultiplePluginVersionGradleImpor override fun testDataDirName(): String = "hmppImportAndHighlighting" override fun clearTextFromMarkup(text: String): String = clearTextFromDiagnosticMarkup(text) - class MultiModulesHmpp : HmppImportAndHighlightingTests() { + class MultiModulesHmpp26 : HmppImportAndHighlightingTests() { @Test @PluginTargetVersions(pluginVersion = "1.5.0+") fun testMultiModulesHmpp() { @@ -479,7 +479,7 @@ abstract class HmppImportAndHighlightingTests : MultiplePluginVersionGradleImpor } } - class HmppLibAndConsumer : HmppImportAndHighlightingTests() { + class HmppLibAndConsumer7 : HmppImportAndHighlightingTests() { @Test @PluginTargetVersions(pluginVersion = "1.4.30+") fun testHmppLibAndConsumer() { @@ -868,7 +868,7 @@ abstract class HmppImportAndHighlightingTests : MultiplePluginVersionGradleImpor } } - class Kt46625SupportedAndUnsupportedPlatform : HmppImportAndHighlightingTests() { + class Kt46625SupportedAndUnsupportedPlatform12 : HmppImportAndHighlightingTests() { @Test @PluginTargetVersions(pluginVersion = "1.5.30+") fun testKt46625SupportedAndUnsupportedPlatform() { diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt index 5697dde429c5..26aa277cd354 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt @@ -17,7 +17,7 @@ import org.junit.Ignore import org.junit.Test abstract class GradleBuildFileHighlightingTest : KotlinGradleImportingTestCase() { - class KtsInJsProject : GradleBuildFileHighlightingTest() { + class KtsInJsProject21 : GradleBuildFileHighlightingTest() { @TargetVersions("4.8 <=> 6.0") @Test fun testKtsInJsProject() { diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt index 195c3cf37664..30f475111f8d 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt @@ -91,7 +91,7 @@ abstract class GradleConfiguratorPlatformSpecificTest : KotlinGradleImportingTes fun testAddLibraryMultiplatformGSK() = doTestAddLibrary() } - class AddLibraryMultiplatformGSK2 : GradleConfiguratorPlatformSpecificTest() { + class AddLibraryMultiplatformGSK210 : GradleConfiguratorPlatformSpecificTest() { @Test @TargetVersions("4.7+") fun testAddLibraryMultiplatformGSK2() = doTestAddLibrary() @@ -103,7 +103,7 @@ abstract class GradleConfiguratorPlatformSpecificTest : KotlinGradleImportingTes fun testAddLibraryMultiplatformGSK3() = doTestAddLibrary() } - class AddLibraryMultiplatformGSK4 : GradleConfiguratorPlatformSpecificTest() { + class AddLibraryMultiplatformGSK43 : GradleConfiguratorPlatformSpecificTest() { @Test @TargetVersions("4.7+") fun testAddLibraryMultiplatformGSK4() = doTestAddLibrary() diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt index 33e3ed07b803..5f3326869018 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt @@ -31,7 +31,7 @@ import org.junit.Ignore import org.junit.Test abstract class GradleConfiguratorTest : KotlinGradleImportingTestCase() { - class ProjectWithModule : GradleConfiguratorTest() { + class ProjectWithModule8 : GradleConfiguratorTest() { @Test fun testProjectWithModule() { importProjectFromTestData() @@ -451,7 +451,7 @@ abstract class GradleConfiguratorTest : KotlinGradleImportingTestCase() { } } - class AddTestLibraryGSK : GradleConfiguratorTest() { + class AddTestLibraryGSK07 : GradleConfiguratorTest() { @Test fun testAddTestLibraryGSK() { val files = importProjectFromTestData() diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt index 88cf2f999c9f..942fd4df9b06 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt @@ -643,7 +643,7 @@ abstract class GradleFacetImportTest : KotlinGradleImportingTestCase() { } } - class JDKImport : GradleFacetImportTest() { + class JDKImport0 : GradleFacetImportTest() { @Test fun testJDKImport() { val mockJdkPath = "${PathManager.getHomePath()}/community/java/mockJDK-1.8" diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt index 8d92a66ca905..2e17b35065d6 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt @@ -37,7 +37,7 @@ abstract class GradleMppNoJvmRunConfigurationProducersTest : GradleTestRunConfig //// ALL IN CLASS ///// - class AllTestsInJsClass : GradleMppNoJvmRunConfigurationProducersTest() { + class AllTestsInJsClass9 : GradleMppNoJvmRunConfigurationProducersTest() { @Test fun allTestsInJsClass() { assertConfigurationFromContext( diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt index 6e16a247cb57..5523a1314ef7 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt @@ -24,13 +24,13 @@ abstract class GradleQuickFixTest : AbstractGradleMultiFileQuickFixTest() { fun testCreateActualForJvm() = doMultiFileQuickFixTest() } - class CreateActualForJvmTest : GradleQuickFixTest() { + class CreateActualForJvmTest20 : GradleQuickFixTest() { @Test @PluginTargetVersions(pluginVersion = "1.5.31+") fun testCreateActualForJvmTest() = doMultiFileQuickFixTest() } - class CreateActualForJvmTestWithCustomPath : GradleQuickFixTest() { + class CreateActualForJvmTestWithCustomPath9 : GradleQuickFixTest() { @Test @PluginTargetVersions(pluginVersion = "1.5.31+") fun testCreateActualForJvmTestWithCustomPath() = doMultiFileQuickFixTest() @@ -42,13 +42,13 @@ abstract class GradleQuickFixTest : AbstractGradleMultiFileQuickFixTest() { fun testCreateActualForJvmTestWithCustomExistentPath() = doMultiFileQuickFixTest() } - class CreateActualForNativeIOS : GradleQuickFixTest() { + class CreateActualForNativeIOS15 : GradleQuickFixTest() { @Test @PluginTargetVersions(pluginVersion = "1.5.31+") fun testCreateActualForNativeIOS() = doMultiFileQuickFixTest() } - class CreateActualForNativeIOSWithExistentPath : GradleQuickFixTest() { + class CreateActualForNativeIOSWithExistentPath2 : GradleQuickFixTest() { @Test @PluginTargetVersions(pluginVersion = "1.5.31+") fun testCreateActualForNativeIOSWithExistentPath() = doMultiFileQuickFixTest() diff --git a/plugins/kotlin/gradle/gradle-native/tests/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesPropagationTest.kt b/plugins/kotlin/gradle/gradle-native/tests/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesPropagationTest.kt index cadf0d1a41f5..e214d086b1cc 100644 --- a/plugins/kotlin/gradle/gradle-native/tests/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesPropagationTest.kt +++ b/plugins/kotlin/gradle/gradle-native/tests/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesPropagationTest.kt @@ -17,7 +17,7 @@ abstract class GradleNativeLibrariesPropagationTest : TestCaseWithFakeKotlinNati private val testedTargets = setOf("ios_arm64", "ios_x64", "watchos_arm32", "watchos_x86") - class CommonIOS : GradleNativeLibrariesPropagationTest() { + class CommonIOS11 : GradleNativeLibrariesPropagationTest() { @Test fun testCommonIOS() { configureProject() diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt index 3d63ca14aea4..5a5407b16072 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt @@ -21,7 +21,7 @@ import kotlin.test.assertNotNull @TestRoot("idea/tests") @TestMetadata("testData/decompiler/lightClassesOrder") @RunWith(JUnit38ClassRunner::class) -class LightClassesClasspathSortingTest : KotlinLightCodeInsightFixtureTestCase() { +class LightClassesClasspathSortingTest07 : KotlinLightCodeInsightFixtureTestCase() { private val mockLibraryFacility = MockLibraryFacility(File(testDataPath, getTestName(true))) fun testExplicitClass() { diff --git a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenImporterTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenImporterTest.kt index bdd4c0abb6bf..43def860e298 100644 --- a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenImporterTest.kt +++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenImporterTest.kt @@ -1030,7 +1030,7 @@ abstract class AbstractKotlinMavenImporterTest : KotlinMavenImportingTestCase() } } - class JvmDetectionByGoalWithJvmStdlib : AbstractKotlinMavenImporterTest() { + class JvmDetectionByGoalWithJvmStdlib6 : AbstractKotlinMavenImporterTest() { @Test fun testJvmDetectionByGoalWithJvmStdlib() { createProjectSubDirs("src/main/kotlin", "src/main/kotlin.jvm", "src/test/kotlin", "src/test/kotlin.jvm") @@ -1387,7 +1387,7 @@ abstract class AbstractKotlinMavenImporterTest : KotlinMavenImportingTestCase() } } - class CommonDetectionByGoalWithJvmStdlib : AbstractKotlinMavenImporterTest() { + class CommonDetectionByGoalWithJvmStdlib116 : AbstractKotlinMavenImporterTest() { @Test fun testCommonDetectionByGoalWithJvmStdlib() { createProjectSubDirs("src/main/kotlin", "src/main/kotlin.jvm", "src/test/kotlin", "src/test/kotlin.jvm")