Minor: move non-JPS MPP IC tests under incremental/mpp dir

compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java

@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("jps-plugin/testData/incremental/singleModule/common")
+@TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -24,21 +24,21 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
     }
 
-    public void testAllFilesPresentInCommon() throws Exception {
+    public void testAllFilesPresentInAllPlatforms() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("touchActual")
     public void testTouchActual() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchActual/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
     }
 
     @TestMetadata("touchExpect")
     public void testTouchExpect() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchExpect/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchActual")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchActual extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -47,11 +47,11 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         }
 
         public void testAllFilesPresentInTouchActual() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchExpect")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchExpect extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -60,7 +60,7 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         }
 
         public void testAllFilesPresentInTouchExpect() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java

@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("jps-plugin/testData/incremental/singleModule/common")
+@TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -24,21 +24,21 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
     }
 
-    public void testAllFilesPresentInCommon() throws Exception {
+    public void testAllFilesPresentInAllPlatforms() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("touchActual")
     public void testTouchActual() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchActual/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
     }
 
     @TestMetadata("touchExpect")
     public void testTouchExpect() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchExpect/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchActual")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchActual extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -47,11 +47,11 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         }
 
         public void testAllFilesPresentInTouchActual() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchExpect")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchExpect extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -60,7 +60,7 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         }
 
         public void testAllFilesPresentInTouchExpect() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -1296,10 +1296,10 @@ fun main(args: Array<String>) {
         }
 
         testClass<AbstractIncrementalMultiplatformJvmCompilerRunnerTest> {
-            model("incremental/singleModule/common", extension = null, excludeParentDirs = true)
+            model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true)
         }
         testClass<AbstractIncrementalMultiplatformJsCompilerRunnerTest> {
-            model("incremental/singleModule/common", extension = null, excludeParentDirs = true)
+            model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true)
         }
     }