From 4941f9b42fa96ea94004a6d67bb2bcadd7930401 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 3 Jun 2021 18:37:00 +0900 Subject: [PATCH] [kotlin] Move tests of the kotlin.maven module to a separate module to get rid of circular dependencies GitOrigin-RevId: af1d329a73c9955793c6fcf8bfef894cddf92a5e --- .idea/modules.xml | 1 + .../kotlin/generators/kotlin.generators.iml | 2 +- .../kotlin/generators/tests/GenerateTests.kt | 2 +- .../kotlin.all-tests/kotlin.all-tests.iml | 1 + plugins/kotlin/maven/kotlin.maven.iml | 5 --- .../maven/KotlinMavenArchetypesProvider.kt | 2 +- .../kotlin/maven/tests/kotlin.maven.tests.iml | 35 +++++++++++++++++++ .../AbstractKotlinMavenInspectionTest.kt | 0 .../KotlinMavenArchetypesProviderTest.kt | 0 .../idea/maven/KotlinMavenImporterTest.kt | 0 .../maven/KotlinMavenImportingTestCase.kt | 0 .../KotlinMavenInspectionTestGenerated.java | 2 +- .../kotlin/idea/maven/MavenMigrateTest.kt | 0 .../kotlin/idea/maven/MavenTestCase.java | 0 .../MavenUpdateConfigurationQuickFixTest.kt | 2 +- ...MavenConfigureProjectByChangingFileTest.kt | 0 ...ureProjectByChangingFileTestGenerated.java | 2 +- .../configurator/js/libraryMissed/pom.xml | 0 .../js/libraryMissed/pom_after.xml | 0 .../configurator/js/pluginMissed/pom.xml | 0 .../js/pluginMissed/pom_after.xml | 0 .../configurator/js/simpleProject/pom.xml | 0 .../js/simpleProject/pom_after.xml | 0 .../js/simpleProjectSnapshot/pom.xml | 0 .../js/simpleProjectSnapshot/pom_after.xml | 0 .../configurator/jvm/fixExisting/pom.xml | 0 .../jvm/fixExisting/pom_after.xml | 0 .../testData/configurator/jvm/jreLib/pom.xml | 0 .../configurator/jvm/jreLib/pom_after.xml | 0 .../configurator/jvm/libraryMissed/pom.xml | 0 .../jvm/libraryMissed/pom_after.xml | 0 .../configurator/jvm/pluginMissed/pom.xml | 0 .../jvm/pluginMissed/pom_after.xml | 0 .../configurator/jvm/simpleProject/pom.xml | 0 .../jvm/simpleProject/pom_after.xml | 0 .../configurator/jvm/simpleProjectEAP/pom.xml | 0 .../jvm/simpleProjectEAP/pom_after.xml | 0 .../configurator/jvm/simpleProjectRc/pom.xml | 0 .../jvm/simpleProjectRc/pom_after.xml | 0 .../jvm/simpleProjectSnapshot/pom.xml | 0 .../jvm/simpleProjectSnapshot/pom_after.xml | 0 .../jvm/withJava9ModuleInfo/module-info.java | 0 .../module-info_after.java | 0 .../jvm/withJava9ModuleInfo/pom.xml | 0 .../jvm/withJava9ModuleInfo/pom_after.xml | 0 .../languageFeature/addKotlinReflect/pom.xml | 0 .../addKotlinReflect/pom.xml.after | 0 .../languageFeature/addKotlinReflect/src.kt | 0 .../languageFeature/enableCoroutines/pom.xml | 0 .../enableCoroutines/pom.xml.after | 0 .../languageFeature/enableCoroutines/src.kt | 0 .../enableInlineClasses/pom.xml | 0 .../enableInlineClasses/pom.xml.after | 0 .../enableInlineClasses/src.kt | 0 .../enableInlineClassesWithXFlag/pom.xml | 0 .../pom.xml.after | 0 .../enableInlineClassesWithXFlag/src.kt | 0 .../languageFeature/updateApiVersion/pom.xml | 0 .../updateApiVersion/pom.xml.after | 0 .../languageFeature/updateApiVersion/src.kt | 0 .../updateLanguageAndApiVersion/pom.xml | 0 .../updateLanguageAndApiVersion/pom.xml.after | 0 .../updateLanguageAndApiVersion/src.kt | 0 .../updateLanguageVersion/pom.xml | 0 .../updateLanguageVersion/pom.xml.after | 0 .../updateLanguageVersion/src.kt | 0 .../updateLanguageVersionProperty/pom.xml | 0 .../pom.xml.after | 0 .../updateLanguageVersionProperty/src.kt | 0 ...ompileAndTestCompileInTheSameExecution.xml | 0 .../dependencyWithNoExecution.fixed.1-5.xml | 0 .../dependencyWithNoExecution.fixed.6.xml | 0 .../dependencyWithNoExecution.xml | 0 .../deprecatedJre.fixed.1.xml | 0 .../maven-inspections/deprecatedJre.xml | 0 ...tedJreWithDependencyManagement.fixed.1.xml | 0 ...tedJreWithDependencyManagement.fixed.2.xml | 0 .../deprecatedJreWithDependencyManagement.xml | 0 .../deprecatedKotlinxCoroutines.fixed.1.xml | 0 .../deprecatedKotlinxCoroutines.xml | 0 .../deprecatedKotlinxCoroutinesNoError.xml | 0 .../maven-inspections/ideAndMavenVersions.xml | 0 .../ideAndMavenVersionsSuppression.xml | 0 .../kotlinTestWithJunit.fixed.1.xml | 0 .../maven-inspections/kotlinTestWithJunit.xml | 0 .../missingDependencies.fixed.1.xml | 0 .../missingDependencies.fixed.2.xml | 0 .../maven-inspections/missingDependencies.xml | 0 .../noExecutions.fixed.1.xml | 0 .../noExecutions.fixed.2.xml | 0 .../maven-inspections/noExecutions.xml | 0 .../maven-inspections/oldVersionWithJre.xml | 0 .../sameVersionPluginLibrary.fixed.1.xml | 0 .../sameVersionPluginLibrary.fixed.2.xml | 0 .../sameVersionPluginLibrary.xml | 0 .../sameVersionPluginLibrarySuppression.xml | 0 .../maven-inspections/wrongJsExecution.xml | 0 .../wrongPhaseExecution.fixed.1.xml | 0 .../wrongPhaseExecution.fixed.2.xml | 0 .../maven-inspections/wrongPhaseExecution.xml | 0 100 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 plugins/kotlin/maven/tests/kotlin.maven.tests.iml rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt (100%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt (100%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt (100%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImportingTestCase.kt (100%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java (99%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt (100%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java (100%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt (96%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt (100%) rename plugins/kotlin/maven/{ => tests}/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java (99%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/libraryMissed/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/libraryMissed/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/pluginMissed/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/pluginMissed/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/simpleProject/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/simpleProject/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/simpleProjectSnapshot/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/js/simpleProjectSnapshot/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/fixExisting/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/fixExisting/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/jreLib/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/jreLib/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/libraryMissed/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/libraryMissed/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/pluginMissed/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/pluginMissed/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProject/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProject/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProjectEAP/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProjectEAP/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProjectRc/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProjectRc/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProjectSnapshot/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/withJava9ModuleInfo/module-info.java (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/withJava9ModuleInfo/module-info_after.java (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/withJava9ModuleInfo/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/addKotlinReflect/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/addKotlinReflect/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/addKotlinReflect/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableCoroutines/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableCoroutines/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableCoroutines/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableInlineClasses/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableInlineClasses/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableInlineClasses/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/enableInlineClassesWithXFlag/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateApiVersion/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateApiVersion/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateApiVersion/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageAndApiVersion/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageAndApiVersion/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageAndApiVersion/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageVersion/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageVersion/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageVersion/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageVersionProperty/pom.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageVersionProperty/pom.xml.after (100%) rename plugins/kotlin/maven/{ => tests}/testData/languageFeature/updateLanguageVersionProperty/src.kt (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/dependencyWithNoExecution.fixed.1-5.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/dependencyWithNoExecution.fixed.6.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/dependencyWithNoExecution.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedJre.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedJre.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.2.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedJreWithDependencyManagement.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedKotlinxCoroutines.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/ideAndMavenVersions.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/ideAndMavenVersionsSuppression.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/kotlinTestWithJunit.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/missingDependencies.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/missingDependencies.fixed.2.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/missingDependencies.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/noExecutions.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/noExecutions.fixed.2.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/noExecutions.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/oldVersionWithJre.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/sameVersionPluginLibrary.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/wrongJsExecution.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/wrongPhaseExecution.fixed.1.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/wrongPhaseExecution.fixed.2.xml (100%) rename plugins/kotlin/maven/{ => tests}/testData/maven-inspections/wrongPhaseExecution.xml (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 0bc40e65fb57..d04ba8b9f145 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -938,6 +938,7 @@ + diff --git a/plugins/kotlin/generators/kotlin.generators.iml b/plugins/kotlin/generators/kotlin.generators.iml index 43b61e64cfff..49998f6f8922 100644 --- a/plugins/kotlin/generators/kotlin.generators.iml +++ b/plugins/kotlin/generators/kotlin.generators.iml @@ -30,7 +30,7 @@ - + diff --git a/plugins/kotlin/generators/test/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/plugins/kotlin/generators/test/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index b73d6029c95e..a493dc1c48fc 100644 --- a/plugins/kotlin/generators/test/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/plugins/kotlin/generators/test/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -1109,7 +1109,7 @@ private fun assembleWorkspace(): TWorkspace = workspace { } } - testGroup("maven") { + testGroup("maven/tests") { testClass { model("configurator/jvm", pattern = DIRECTORY, isRecursive = false, testMethodName = "doTestWithMaven") model("configurator/js", pattern = DIRECTORY, isRecursive = false, testMethodName = "doTestWithJSMaven") diff --git a/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml b/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml index a25b486147ac..8bc7cd452cb3 100644 --- a/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml +++ b/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml @@ -49,6 +49,7 @@ + diff --git a/plugins/kotlin/maven/kotlin.maven.iml b/plugins/kotlin/maven/kotlin.maven.iml index 835fc83376bd..c1878f798cc8 100644 --- a/plugins/kotlin/maven/kotlin.maven.iml +++ b/plugins/kotlin/maven/kotlin.maven.iml @@ -19,24 +19,19 @@ - - - - - diff --git a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt index e9567237317f..af9df94d5130 100644 --- a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt +++ b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt @@ -72,7 +72,7 @@ class KotlinMavenArchetypesProvider(private val kotlinPluginVersion: String, pri } } - internal fun extractVersions(root: JsonElement) = + fun extractVersions(root: JsonElement) = root.asJsonObject.get("response") .asJsonObject.get("docs") .asJsonArray diff --git a/plugins/kotlin/maven/tests/kotlin.maven.tests.iml b/plugins/kotlin/maven/tests/kotlin.maven.tests.iml new file mode 100644 index 000000000000..6e610e5b369e --- /dev/null +++ b/plugins/kotlin/maven/tests/kotlin.maven.tests.iml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt similarity index 100% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt similarity index 100% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt similarity index 100% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImportingTestCase.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImportingTestCase.kt similarity index 100% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImportingTestCase.kt rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImportingTestCase.kt diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java similarity index 99% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java index 404b314a7f51..832fb6823141 100644 --- a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java +++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.runner.RunWith; * DO NOT MODIFY MANUALLY. */ @SuppressWarnings("all") -@TestRoot("maven") +@TestRoot("maven/tests") @TestDataPath("$CONTENT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("testData/maven-inspections") diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt similarity index 100% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java similarity index 100% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt similarity index 96% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt index fac8d93628a9..7dc0516bb682 100644 --- a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt +++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt @@ -25,7 +25,7 @@ class MavenUpdateConfigurationQuickFixTest : KotlinMavenImportingTestCase() { private lateinit var codeInsightTestFixture: CodeInsightTestFixture private fun getTestDataPath(): String { - return KotlinRoot.DIR.resolve("maven/testData/languageFeature").resolve(getTestName(true)).path.substringBefore('_') + return KotlinRoot.DIR.resolve("maven/tests/testData/languageFeature").resolve(getTestName(true)).path.substringBefore('_') } override fun setUpFixtures() { diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt similarity index 100% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt diff --git a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java similarity index 99% rename from plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java rename to plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java index 8d4682beb571..57059dfb7fef 100644 --- a/plugins/kotlin/maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java +++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.runner.RunWith; * DO NOT MODIFY MANUALLY. */ @SuppressWarnings("all") -@TestRoot("maven") +@TestRoot("maven/tests") @TestDataPath("$CONTENT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public abstract class MavenConfigureProjectByChangingFileTestGenerated extends AbstractMavenConfigureProjectByChangingFileTest { diff --git a/plugins/kotlin/maven/testData/configurator/js/libraryMissed/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/js/libraryMissed/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/libraryMissed/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/libraryMissed/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/js/libraryMissed/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/js/libraryMissed/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/libraryMissed/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/libraryMissed/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/js/pluginMissed/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/js/pluginMissed/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/pluginMissed/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/pluginMissed/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/js/pluginMissed/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/js/pluginMissed/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/pluginMissed/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/pluginMissed/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/js/simpleProject/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/js/simpleProject/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/simpleProject/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/simpleProject/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/js/simpleProject/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/js/simpleProject/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/simpleProject/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/simpleProject/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/js/simpleProjectSnapshot/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/js/simpleProjectSnapshot/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/simpleProjectSnapshot/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/simpleProjectSnapshot/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/js/simpleProjectSnapshot/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/js/simpleProjectSnapshot/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/fixExisting/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/fixExisting/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/fixExisting/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/fixExisting/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/fixExisting/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/fixExisting/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/fixExisting/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/fixExisting/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/jreLib/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/jreLib/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/jreLib/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/jreLib/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/jreLib/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/jreLib/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/jreLib/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/jreLib/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/libraryMissed/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/libraryMissed/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/libraryMissed/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/libraryMissed/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/libraryMissed/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/libraryMissed/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/libraryMissed/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/libraryMissed/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/pluginMissed/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/pluginMissed/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/pluginMissed/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/pluginMissed/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/pluginMissed/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/pluginMissed/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/pluginMissed/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/pluginMissed/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProject/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProject/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProject/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProject/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProject/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProject/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProject/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProject/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProjectEAP/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectEAP/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProjectEAP/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectEAP/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectEAP/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectEAP/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProjectRc/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectRc/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProjectRc/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectRc/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectRc/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectRc/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProjectSnapshot/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectSnapshot/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProjectSnapshot/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectSnapshot/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/module-info.java b/plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/module-info.java similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/module-info.java rename to plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/module-info.java diff --git a/plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/module-info_after.java b/plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/module-info_after.java similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/module-info_after.java rename to plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/module-info_after.java diff --git a/plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/pom.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/pom.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/pom.xml diff --git a/plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml b/plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml similarity index 100% rename from plugins/kotlin/maven/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml rename to plugins/kotlin/maven/tests/testData/configurator/jvm/withJava9ModuleInfo/pom_after.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/addKotlinReflect/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/addKotlinReflect/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/addKotlinReflect/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/addKotlinReflect/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/addKotlinReflect/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/addKotlinReflect/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/addKotlinReflect/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/addKotlinReflect/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/addKotlinReflect/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/addKotlinReflect/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/addKotlinReflect/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/addKotlinReflect/src.kt diff --git a/plugins/kotlin/maven/testData/languageFeature/enableCoroutines/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/enableCoroutines/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableCoroutines/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/enableCoroutines/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/enableCoroutines/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/enableCoroutines/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableCoroutines/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/enableCoroutines/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/enableCoroutines/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/enableCoroutines/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableCoroutines/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/enableCoroutines/src.kt diff --git a/plugins/kotlin/maven/testData/languageFeature/enableInlineClasses/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClasses/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableInlineClasses/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClasses/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/enableInlineClasses/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClasses/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableInlineClasses/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClasses/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/enableInlineClasses/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClasses/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableInlineClasses/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClasses/src.kt diff --git a/plugins/kotlin/maven/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClassesWithXFlag/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/enableInlineClassesWithXFlag/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClassesWithXFlag/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/enableInlineClassesWithXFlag/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/enableInlineClassesWithXFlag/src.kt diff --git a/plugins/kotlin/maven/testData/languageFeature/updateApiVersion/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/updateApiVersion/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateApiVersion/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/updateApiVersion/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/updateApiVersion/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/updateApiVersion/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateApiVersion/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/updateApiVersion/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/updateApiVersion/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/updateApiVersion/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateApiVersion/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/updateApiVersion/src.kt diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageAndApiVersion/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageAndApiVersion/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageAndApiVersion/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageAndApiVersion/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageAndApiVersion/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageAndApiVersion/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageAndApiVersion/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageAndApiVersion/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageAndApiVersion/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageAndApiVersion/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageAndApiVersion/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageAndApiVersion/src.kt diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageVersion/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersion/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageVersion/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersion/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageVersion/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersion/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageVersion/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersion/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageVersion/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersion/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageVersion/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersion/src.kt diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageVersionProperty/pom.xml b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersionProperty/pom.xml similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageVersionProperty/pom.xml rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersionProperty/pom.xml diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageVersionProperty/pom.xml.after b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersionProperty/pom.xml.after similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageVersionProperty/pom.xml.after rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersionProperty/pom.xml.after diff --git a/plugins/kotlin/maven/testData/languageFeature/updateLanguageVersionProperty/src.kt b/plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersionProperty/src.kt similarity index 100% rename from plugins/kotlin/maven/testData/languageFeature/updateLanguageVersionProperty/src.kt rename to plugins/kotlin/maven/tests/testData/languageFeature/updateLanguageVersionProperty/src.kt diff --git a/plugins/kotlin/maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/bothCompileAndTestCompileInTheSameExecution.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/dependencyWithNoExecution.fixed.1-5.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/dependencyWithNoExecution.fixed.1-5.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/dependencyWithNoExecution.fixed.1-5.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/dependencyWithNoExecution.fixed.1-5.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/dependencyWithNoExecution.fixed.6.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/dependencyWithNoExecution.fixed.6.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/dependencyWithNoExecution.fixed.6.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/dependencyWithNoExecution.fixed.6.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/dependencyWithNoExecution.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/dependencyWithNoExecution.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/dependencyWithNoExecution.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/dependencyWithNoExecution.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedJre.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJre.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedJre.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJre.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedJre.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJre.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedJre.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJre.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.2.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.2.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.2.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJreWithDependencyManagement.fixed.2.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJreWithDependencyManagement.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedJreWithDependencyManagement.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedJreWithDependencyManagement.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedKotlinxCoroutines.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedKotlinxCoroutines.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/ideAndMavenVersions.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/ideAndMavenVersions.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/ideAndMavenVersions.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/ideAndMavenVersions.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/ideAndMavenVersionsSuppression.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/ideAndMavenVersionsSuppression.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/ideAndMavenVersionsSuppression.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/ideAndMavenVersionsSuppression.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/kotlinTestWithJunit.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/kotlinTestWithJunit.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/kotlinTestWithJunit.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/kotlinTestWithJunit.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/missingDependencies.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/missingDependencies.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/missingDependencies.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/missingDependencies.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/missingDependencies.fixed.2.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/missingDependencies.fixed.2.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/missingDependencies.fixed.2.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/missingDependencies.fixed.2.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/missingDependencies.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/missingDependencies.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/missingDependencies.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/missingDependencies.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/noExecutions.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/noExecutions.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/noExecutions.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/noExecutions.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/noExecutions.fixed.2.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/noExecutions.fixed.2.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/noExecutions.fixed.2.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/noExecutions.fixed.2.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/noExecutions.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/noExecutions.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/noExecutions.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/noExecutions.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/oldVersionWithJre.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/oldVersionWithJre.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/oldVersionWithJre.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/oldVersionWithJre.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrary.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrary.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrary.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrary.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/wrongJsExecution.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/wrongJsExecution.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/wrongJsExecution.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/wrongJsExecution.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/wrongPhaseExecution.fixed.1.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/wrongPhaseExecution.fixed.1.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/wrongPhaseExecution.fixed.1.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/wrongPhaseExecution.fixed.1.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/wrongPhaseExecution.fixed.2.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/wrongPhaseExecution.fixed.2.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/wrongPhaseExecution.fixed.2.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/wrongPhaseExecution.fixed.2.xml diff --git a/plugins/kotlin/maven/testData/maven-inspections/wrongPhaseExecution.xml b/plugins/kotlin/maven/tests/testData/maven-inspections/wrongPhaseExecution.xml similarity index 100% rename from plugins/kotlin/maven/testData/maven-inspections/wrongPhaseExecution.xml rename to plugins/kotlin/maven/tests/testData/maven-inspections/wrongPhaseExecution.xml