Regenerate tests

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

@@ -17,7 +17,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/js/friendsModuleDisabled")
+@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalJsCompilerRunnerWithFriendModulesDisabledTestGenerated extends AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest {
@@ -26,11 +26,11 @@ public class IncrementalJsCompilerRunnerWithFriendModulesDisabledTestGenerated e
     }
 
     public void testAllFilesPresentInFriendsModuleDisabled() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/js/friendsModuleDisabled"), Pattern.compile("^([^\\.]+)$"), null, false);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled"), Pattern.compile("^([^\\.]+)$"), null, false);
     }
 
     @TestMetadata("internalInlineFunctionIsChanged")
     public void testInternalInlineFunctionIsChanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/");
+        runTest("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/");
     }
 }

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

@@ -17,7 +17,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/multiModule/common")
+@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -26,130 +26,130 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
     }
 
     public void testAllFilesPresentInCommon() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("classAdded")
     public void testClassAdded() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/classAdded/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/classAdded/");
     }
 
     @TestMetadata("classRemoved")
     public void testClassRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/classRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/");
     }
 
     @TestMetadata("constantValueChanged")
     public void testConstantValueChanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
     }
 
     @TestMetadata("copyFileToAnotherModule")
     public void testCopyFileToAnotherModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
     }
 
     @TestMetadata("defaultArgumentInConstructorRemoved")
     public void testDefaultArgumentInConstructorRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
     }
 
     @TestMetadata("defaultParameterAdded")
     public void testDefaultParameterAdded() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
     }
 
     @TestMetadata("defaultParameterAddedForTopLevelFun")
     public void testDefaultParameterAddedForTopLevelFun() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
     }
 
     @TestMetadata("defaultParameterRemoved")
     public void testDefaultParameterRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
     }
 
     @TestMetadata("defaultParameterRemovedForTopLevelFun")
     public void testDefaultParameterRemovedForTopLevelFun() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
     }
 
     @TestMetadata("defaultValueInConstructorRemoved")
     public void testDefaultValueInConstructorRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
     }
 
     @TestMetadata("duplicatedClass")
     public void testDuplicatedClass() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
     }
 
     @TestMetadata("exportedDependency")
     public void testExportedDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
     }
 
     @TestMetadata("functionFromDifferentPackageChanged")
     public void testFunctionFromDifferentPackageChanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
     }
 
     @TestMetadata("inlineFunctionInlined")
     public void testInlineFunctionInlined() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
     }
 
     @TestMetadata("inlineFunctionTwoPackageParts")
     public void testInlineFunctionTwoPackageParts() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
     }
 
     @TestMetadata("moveFileToAnotherModule")
     public void testMoveFileToAnotherModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simple/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simple/");
     }
 
     @TestMetadata("simpleDependency")
     public void testSimpleDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
     }
 
     @TestMetadata("simpleDependencyErrorOnAccessToInternal1")
     public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
     }
 
     @TestMetadata("simpleDependencyErrorOnAccessToInternal2")
     public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
     }
 
     @TestMetadata("simpleDependencyUnchanged")
     public void testSimpleDependencyUnchanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
     }
 
     @TestMetadata("transitiveDependency")
     public void testTransitiveDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
     }
 
     @TestMetadata("transitiveInlining")
     public void testTransitiveInlining() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
     }
 
     @TestMetadata("twoDependants")
     public void testTwoDependants() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/twoDependants/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classAdded")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classAdded")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassAdded extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -158,11 +158,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInClassAdded() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassRemoved extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -171,11 +171,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInClassRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ConstantValueChanged extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -184,11 +184,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInConstantValueChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CopyFileToAnotherModule extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -197,11 +197,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -210,11 +210,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterAdded extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -223,11 +223,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInDefaultParameterAdded() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -236,11 +236,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterRemoved extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -249,11 +249,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInDefaultParameterRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -262,11 +262,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultValueInConstructorRemoved extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -275,11 +275,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DuplicatedClass extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -288,11 +288,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInDuplicatedClass() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/exportedDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ExportedDependency extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -301,11 +301,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInExportedDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -314,11 +314,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InlineFunctionInlined extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -327,11 +327,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInInlineFunctionInlined() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InlineFunctionTwoPackageParts extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -340,11 +340,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MoveFileToAnotherModule extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -353,11 +353,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simple")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simple")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Simple extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -366,11 +366,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInSimple() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependency extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -379,11 +379,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInSimpleDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -392,11 +392,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -405,11 +405,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyUnchanged extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -418,11 +418,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TransitiveDependency extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -431,11 +431,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInTransitiveDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TransitiveInlining extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -444,11 +444,11 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInTransitiveInlining() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/twoDependants")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TwoDependants extends AbstractIncrementalMultiModuleJsCompilerRunnerTest {
@@ -457,7 +457,7 @@ public class IncrementalMultiModuleJsCompilerRunnerTestGenerated extends Abstrac
         }
 
         public void testAllFilesPresentInTwoDependants() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

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

@@ -17,7 +17,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/multiModule/common")
+@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -26,130 +26,130 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
     }
 
     public void testAllFilesPresentInCommon() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("classAdded")
     public void testClassAdded() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/classAdded/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/classAdded/");
     }
 
     @TestMetadata("classRemoved")
     public void testClassRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/classRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/");
     }
 
     @TestMetadata("constantValueChanged")
     public void testConstantValueChanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
     }
 
     @TestMetadata("copyFileToAnotherModule")
     public void testCopyFileToAnotherModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
     }
 
     @TestMetadata("defaultArgumentInConstructorRemoved")
     public void testDefaultArgumentInConstructorRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
     }
 
     @TestMetadata("defaultParameterAdded")
     public void testDefaultParameterAdded() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
     }
 
     @TestMetadata("defaultParameterAddedForTopLevelFun")
     public void testDefaultParameterAddedForTopLevelFun() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
     }
 
     @TestMetadata("defaultParameterRemoved")
     public void testDefaultParameterRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
     }
 
     @TestMetadata("defaultParameterRemovedForTopLevelFun")
     public void testDefaultParameterRemovedForTopLevelFun() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
     }
 
     @TestMetadata("defaultValueInConstructorRemoved")
     public void testDefaultValueInConstructorRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
     }
 
     @TestMetadata("duplicatedClass")
     public void testDuplicatedClass() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
     }
 
     @TestMetadata("exportedDependency")
     public void testExportedDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
     }
 
     @TestMetadata("functionFromDifferentPackageChanged")
     public void testFunctionFromDifferentPackageChanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
     }
 
     @TestMetadata("inlineFunctionInlined")
     public void testInlineFunctionInlined() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
     }
 
     @TestMetadata("inlineFunctionTwoPackageParts")
     public void testInlineFunctionTwoPackageParts() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
     }
 
     @TestMetadata("moveFileToAnotherModule")
     public void testMoveFileToAnotherModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simple/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simple/");
     }
 
     @TestMetadata("simpleDependency")
     public void testSimpleDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
     }
 
     @TestMetadata("simpleDependencyErrorOnAccessToInternal1")
     public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
     }
 
     @TestMetadata("simpleDependencyErrorOnAccessToInternal2")
     public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
     }
 
     @TestMetadata("simpleDependencyUnchanged")
     public void testSimpleDependencyUnchanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
     }
 
     @TestMetadata("transitiveDependency")
     public void testTransitiveDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
     }
 
     @TestMetadata("transitiveInlining")
     public void testTransitiveInlining() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
     }
 
     @TestMetadata("twoDependants")
     public void testTwoDependants() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/twoDependants/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classAdded")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classAdded")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassAdded extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -158,11 +158,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInClassAdded() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -171,11 +171,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInClassRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ConstantValueChanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -184,11 +184,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInConstantValueChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CopyFileToAnotherModule extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -197,11 +197,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -210,11 +210,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterAdded extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -223,11 +223,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInDefaultParameterAdded() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -236,11 +236,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -249,11 +249,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInDefaultParameterRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -262,11 +262,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultValueInConstructorRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -275,11 +275,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DuplicatedClass extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -288,11 +288,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInDuplicatedClass() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/exportedDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ExportedDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -301,11 +301,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInExportedDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -314,11 +314,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InlineFunctionInlined extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -327,11 +327,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInInlineFunctionInlined() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InlineFunctionTwoPackageParts extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -340,11 +340,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MoveFileToAnotherModule extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -353,11 +353,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simple")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simple")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Simple extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -366,11 +366,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInSimple() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -379,11 +379,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInSimpleDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -392,11 +392,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -405,11 +405,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyUnchanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -418,11 +418,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TransitiveDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -431,11 +431,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInTransitiveDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TransitiveInlining extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -444,11 +444,11 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInTransitiveInlining() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/twoDependants")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TwoDependants extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
@@ -457,7 +457,7 @@ public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends Abs
         }
 
         public void testAllFilesPresentInTwoDependants() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

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

@@ -17,7 +17,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/mpp/allPlatforms")
+@TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -26,20 +26,20 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
     }
 
     public void testAllFilesPresentInAllPlatforms() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("touchActual")
     public void testTouchActual() throws Exception {
-        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
+        runTest("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
     }
 
     @TestMetadata("touchExpect")
     public void testTouchExpect() throws Exception {
-        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
+        runTest("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
+    @TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchActual extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -48,11 +48,11 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         }
 
         public void testAllFilesPresentInTouchActual() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
+    @TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchExpect extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -61,7 +61,7 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         }
 
         public void testAllFilesPresentInTouchExpect() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

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

@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
-    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms")
+    @TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class AllPlatforms extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -28,20 +28,20 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         }
 
         public void testAllFilesPresentInAllPlatforms() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("touchActual")
         public void testTouchActual() throws Exception {
-            runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
+            runTest("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
         }
 
         @TestMetadata("touchExpect")
         public void testTouchExpect() throws Exception {
-            runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
+            runTest("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
+        @TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class TouchActual extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -50,11 +50,11 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
             }
 
             public void testAllFilesPresentInTouchActual() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
+        @TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class TouchExpect extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -63,12 +63,12 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
             }
 
             public void testAllFilesPresentInTouchExpect() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/mpp/jvmOnly")
+    @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnly")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JvmOnly extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -77,15 +77,15 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         }
 
         public void testAllFilesPresentInJvmOnly() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/jvmOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("multifilePartChanged")
         public void testMultifilePartChanged() throws Exception {
-            runTest("jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/");
+            runTest("jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged")
+        @TestMetadata("jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MultifilePartChanged extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -94,7 +94,7 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
             }
 
             public void testAllFilesPresentInMultifilePartChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java

@@ -17,7 +17,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/cacheVersionChanged")
+@TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class DataContainerVersionChangedTestGenerated extends AbstractDataContainerVersionChangedTest {
@@ -26,65 +26,65 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
     }
 
     public void testAllFilesPresentInCacheVersionChanged() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("clearedHasKotlin")
     public void testClearedHasKotlin() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/");
     }
 
     @TestMetadata("exportedModule")
     public void testExportedModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/");
     }
 
     @TestMetadata("javaOnlyModulesAreNotAffected")
     public void testJavaOnlyModulesAreNotAffected() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/");
     }
 
     @TestMetadata("module1Modified")
     public void testModule1Modified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/");
     }
 
     @TestMetadata("module2Modified")
     public void testModule2Modified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/");
     }
 
     @TestMetadata("moduleWithConstantModified")
     public void testModuleWithConstantModified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/");
     }
 
     @TestMetadata("moduleWithInlineModified")
     public void testModuleWithInlineModified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/");
     }
 
     @TestMetadata("touchedFile")
     public void testTouchedFile() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/");
     }
 
     @TestMetadata("touchedOnlyJavaFile")
     public void testTouchedOnlyJavaFile() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/");
     }
 
     @TestMetadata("untouchedFiles")
     public void testUntouchedFiles() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/");
     }
 
     @TestMetadata("withError")
     public void testWithError() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/withError/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClearedHasKotlin extends AbstractDataContainerVersionChangedTest {
@@ -93,11 +93,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInClearedHasKotlin() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ExportedModule extends AbstractDataContainerVersionChangedTest {
@@ -106,11 +106,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInExportedModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaOnlyModulesAreNotAffected extends AbstractDataContainerVersionChangedTest {
@@ -119,11 +119,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInJavaOnlyModulesAreNotAffected() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Module1Modified extends AbstractDataContainerVersionChangedTest {
@@ -132,11 +132,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInModule1Modified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Module2Modified extends AbstractDataContainerVersionChangedTest {
@@ -145,11 +145,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInModule2Modified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ModuleWithConstantModified extends AbstractDataContainerVersionChangedTest {
@@ -158,11 +158,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInModuleWithConstantModified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ModuleWithInlineModified extends AbstractDataContainerVersionChangedTest {
@@ -171,11 +171,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInModuleWithInlineModified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchedFile extends AbstractDataContainerVersionChangedTest {
@@ -184,11 +184,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInTouchedFile() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchedOnlyJavaFile extends AbstractDataContainerVersionChangedTest {
@@ -197,11 +197,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInTouchedOnlyJavaFile() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UntouchedFiles extends AbstractDataContainerVersionChangedTest {
@@ -210,11 +210,11 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInUntouchedFiles() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/withError")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithError extends AbstractDataContainerVersionChangedTest {
@@ -223,7 +223,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai
         }
 
         public void testAllFilesPresentInWithError() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java

@@ -17,7 +17,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/cacheVersionChanged")
+@TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncrementalCacheVersionChangedTest {
@@ -26,65 +26,65 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
     }
 
     public void testAllFilesPresentInCacheVersionChanged() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("clearedHasKotlin")
     public void testClearedHasKotlin() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/");
     }
 
     @TestMetadata("exportedModule")
     public void testExportedModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/");
     }
 
     @TestMetadata("javaOnlyModulesAreNotAffected")
     public void testJavaOnlyModulesAreNotAffected() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/");
     }
 
     @TestMetadata("module1Modified")
     public void testModule1Modified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/");
     }
 
     @TestMetadata("module2Modified")
     public void testModule2Modified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/");
     }
 
     @TestMetadata("moduleWithConstantModified")
     public void testModuleWithConstantModified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/");
     }
 
     @TestMetadata("moduleWithInlineModified")
     public void testModuleWithInlineModified() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/");
     }
 
     @TestMetadata("touchedFile")
     public void testTouchedFile() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/");
     }
 
     @TestMetadata("touchedOnlyJavaFile")
     public void testTouchedOnlyJavaFile() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/");
     }
 
     @TestMetadata("untouchedFiles")
     public void testUntouchedFiles() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/");
     }
 
     @TestMetadata("withError")
     public void testWithError() throws Exception {
-        runTest("jps-plugin/testData/incremental/cacheVersionChanged/withError/");
+        runTest("jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClearedHasKotlin extends AbstractIncrementalCacheVersionChangedTest {
@@ -93,11 +93,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInClearedHasKotlin() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ExportedModule extends AbstractIncrementalCacheVersionChangedTest {
@@ -106,11 +106,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInExportedModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaOnlyModulesAreNotAffected extends AbstractIncrementalCacheVersionChangedTest {
@@ -119,11 +119,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInJavaOnlyModulesAreNotAffected() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Module1Modified extends AbstractIncrementalCacheVersionChangedTest {
@@ -132,11 +132,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInModule1Modified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Module2Modified extends AbstractIncrementalCacheVersionChangedTest {
@@ -145,11 +145,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInModule2Modified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ModuleWithConstantModified extends AbstractIncrementalCacheVersionChangedTest {
@@ -158,11 +158,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInModuleWithConstantModified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ModuleWithInlineModified extends AbstractIncrementalCacheVersionChangedTest {
@@ -171,11 +171,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInModuleWithInlineModified() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchedFile extends AbstractIncrementalCacheVersionChangedTest {
@@ -184,11 +184,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInTouchedFile() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchedOnlyJavaFile extends AbstractIncrementalCacheVersionChangedTest {
@@ -197,11 +197,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInTouchedOnlyJavaFile() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UntouchedFiles extends AbstractIncrementalCacheVersionChangedTest {
@@ -210,11 +210,11 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInUntouchedFiles() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError")
+    @TestMetadata("jps/jps-plugin/testData/incremental/cacheVersionChanged/withError")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithError extends AbstractIncrementalCacheVersionChangedTest {
@@ -223,7 +223,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme
         }
 
         public void testAllFilesPresentInWithError() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java

@@ -17,7 +17,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/multiModule/common")
+@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest {
@@ -26,130 +26,130 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
     }
 
     public void testAllFilesPresentInCommon() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("classAdded")
     public void testClassAdded() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/classAdded/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/classAdded/");
     }
 
     @TestMetadata("classRemoved")
     public void testClassRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/classRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/");
     }
 
     @TestMetadata("constantValueChanged")
     public void testConstantValueChanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
     }
 
     @TestMetadata("copyFileToAnotherModule")
     public void testCopyFileToAnotherModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
     }
 
     @TestMetadata("defaultArgumentInConstructorRemoved")
     public void testDefaultArgumentInConstructorRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
     }
 
     @TestMetadata("defaultParameterAdded")
     public void testDefaultParameterAdded() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
     }
 
     @TestMetadata("defaultParameterAddedForTopLevelFun")
     public void testDefaultParameterAddedForTopLevelFun() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
     }
 
     @TestMetadata("defaultParameterRemoved")
     public void testDefaultParameterRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
     }
 
     @TestMetadata("defaultParameterRemovedForTopLevelFun")
     public void testDefaultParameterRemovedForTopLevelFun() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
     }
 
     @TestMetadata("defaultValueInConstructorRemoved")
     public void testDefaultValueInConstructorRemoved() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
     }
 
     @TestMetadata("duplicatedClass")
     public void testDuplicatedClass() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
     }
 
     @TestMetadata("exportedDependency")
     public void testExportedDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
     }
 
     @TestMetadata("functionFromDifferentPackageChanged")
     public void testFunctionFromDifferentPackageChanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
     }
 
     @TestMetadata("inlineFunctionInlined")
     public void testInlineFunctionInlined() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
     }
 
     @TestMetadata("inlineFunctionTwoPackageParts")
     public void testInlineFunctionTwoPackageParts() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
     }
 
     @TestMetadata("moveFileToAnotherModule")
     public void testMoveFileToAnotherModule() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simple/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simple/");
     }
 
     @TestMetadata("simpleDependency")
     public void testSimpleDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
     }
 
     @TestMetadata("simpleDependencyErrorOnAccessToInternal1")
     public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
     }
 
     @TestMetadata("simpleDependencyErrorOnAccessToInternal2")
     public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
     }
 
     @TestMetadata("simpleDependencyUnchanged")
     public void testSimpleDependencyUnchanged() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
     }
 
     @TestMetadata("transitiveDependency")
     public void testTransitiveDependency() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
     }
 
     @TestMetadata("transitiveInlining")
     public void testTransitiveInlining() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
     }
 
     @TestMetadata("twoDependants")
     public void testTwoDependants() throws Exception {
-        runTest("jps-plugin/testData/incremental/multiModule/common/twoDependants/");
+        runTest("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classAdded")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classAdded")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassAdded extends AbstractIncrementalJsJpsTest {
@@ -158,11 +158,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInClassAdded() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassRemoved extends AbstractIncrementalJsJpsTest {
@@ -171,11 +171,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInClassRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ConstantValueChanged extends AbstractIncrementalJsJpsTest {
@@ -184,11 +184,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInConstantValueChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CopyFileToAnotherModule extends AbstractIncrementalJsJpsTest {
@@ -197,11 +197,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalJsJpsTest {
@@ -210,11 +210,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterAdded extends AbstractIncrementalJsJpsTest {
@@ -223,11 +223,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInDefaultParameterAdded() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalJsJpsTest {
@@ -236,11 +236,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterRemoved extends AbstractIncrementalJsJpsTest {
@@ -249,11 +249,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInDefaultParameterRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalJsJpsTest {
@@ -262,11 +262,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DefaultValueInConstructorRemoved extends AbstractIncrementalJsJpsTest {
@@ -275,11 +275,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class DuplicatedClass extends AbstractIncrementalJsJpsTest {
@@ -288,11 +288,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInDuplicatedClass() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/exportedDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ExportedDependency extends AbstractIncrementalJsJpsTest {
@@ -301,11 +301,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInExportedDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalJsJpsTest {
@@ -314,11 +314,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InlineFunctionInlined extends AbstractIncrementalJsJpsTest {
@@ -327,11 +327,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInInlineFunctionInlined() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InlineFunctionTwoPackageParts extends AbstractIncrementalJsJpsTest {
@@ -340,11 +340,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MoveFileToAnotherModule extends AbstractIncrementalJsJpsTest {
@@ -353,11 +353,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simple")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simple")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Simple extends AbstractIncrementalJsJpsTest {
@@ -366,11 +366,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInSimple() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependency extends AbstractIncrementalJsJpsTest {
@@ -379,11 +379,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInSimpleDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalJsJpsTest {
@@ -392,11 +392,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalJsJpsTest {
@@ -405,11 +405,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleDependencyUnchanged extends AbstractIncrementalJsJpsTest {
@@ -418,11 +418,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TransitiveDependency extends AbstractIncrementalJsJpsTest {
@@ -431,11 +431,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInTransitiveDependency() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TransitiveInlining extends AbstractIncrementalJsJpsTest {
@@ -444,11 +444,11 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInTransitiveInlining() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/common/twoDependants")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TwoDependants extends AbstractIncrementalJsJpsTest {
@@ -457,7 +457,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest
         }
 
         public void testAllFilesPresentInTwoDependants() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java

@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyCachesTest {
-    @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches")
+    @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class LazyKotlinCaches extends AbstractIncrementalLazyCachesTest {
@@ -28,50 +28,50 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
         }
 
         public void testAllFilesPresentInLazyKotlinCaches() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("class")
         public void testClass() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/class/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/");
         }
 
         @TestMetadata("classInheritance")
         public void testClassInheritance() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/");
         }
 
         @TestMetadata("constant")
         public void testConstant() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/constant/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/");
         }
 
         @TestMetadata("function")
         public void testFunction() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/function/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/");
         }
 
         @TestMetadata("inlineFunctionWithUsage")
         public void testInlineFunctionWithUsage() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/");
         }
 
         @TestMetadata("inlineFunctionWithoutUsage")
         public void testInlineFunctionWithoutUsage() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/");
         }
 
         @TestMetadata("noKotlin")
         public void testNoKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/");
         }
 
         @TestMetadata("topLevelPropertyAccess")
         public void testTopLevelPropertyAccess() throws Exception {
-            runTest("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/");
+            runTest("jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/class")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Class extends AbstractIncrementalLazyCachesTest {
@@ -80,11 +80,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInClass() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/class"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/class"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassInheritance extends AbstractIncrementalLazyCachesTest {
@@ -93,11 +93,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInClassInheritance() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Constant extends AbstractIncrementalLazyCachesTest {
@@ -106,11 +106,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInConstant() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/constant"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/function")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Function extends AbstractIncrementalLazyCachesTest {
@@ -119,11 +119,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInFunction() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/function"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/function"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class InlineFunctionWithUsage extends AbstractIncrementalLazyCachesTest {
@@ -132,11 +132,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInInlineFunctionWithUsage() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class InlineFunctionWithoutUsage extends AbstractIncrementalLazyCachesTest {
@@ -145,11 +145,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInInlineFunctionWithoutUsage() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NoKotlin extends AbstractIncrementalLazyCachesTest {
@@ -158,11 +158,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInNoKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess")
+        @TestMetadata("jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class TopLevelPropertyAccess extends AbstractIncrementalLazyCachesTest {
@@ -171,12 +171,12 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInTopLevelPropertyAccess() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption")
+    @TestMetadata("jps/jps-plugin/testData/incremental/changeIncrementalOption")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ChangeIncrementalOption extends AbstractIncrementalLazyCachesTest {
@@ -185,30 +185,30 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
         }
 
         public void testAllFilesPresentInChangeIncrementalOption() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("incrementalOff")
         public void testIncrementalOff() throws Exception {
-            runTest("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/");
+            runTest("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/");
         }
 
         @TestMetadata("incrementalOffOn")
         public void testIncrementalOffOn() throws Exception {
-            runTest("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/");
+            runTest("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/");
         }
 
         @TestMetadata("incrementalOffOnJavaChanged")
         public void testIncrementalOffOnJavaChanged() throws Exception {
-            runTest("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/");
+            runTest("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/");
         }
 
         @TestMetadata("incrementalOffOnJavaOnly")
         public void testIncrementalOffOnJavaOnly() throws Exception {
-            runTest("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/");
+            runTest("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff")
+        @TestMetadata("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class IncrementalOff extends AbstractIncrementalLazyCachesTest {
@@ -217,11 +217,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInIncrementalOff() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn")
+        @TestMetadata("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class IncrementalOffOn extends AbstractIncrementalLazyCachesTest {
@@ -230,11 +230,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInIncrementalOffOn() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged")
+        @TestMetadata("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class IncrementalOffOnJavaChanged extends AbstractIncrementalLazyCachesTest {
@@ -243,11 +243,11 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInIncrementalOffOnJavaChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly")
+        @TestMetadata("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class IncrementalOffOnJavaOnly extends AbstractIncrementalLazyCachesTest {
@@ -256,7 +256,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
             }
 
             public void testAllFilesPresentInIncrementalOffOnJavaOnly() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java

@@ -17,7 +17,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/lookupTracker/jsKlib")
+@TestMetadata("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JsKlibLookupTrackerTestGenerated extends AbstractJsKlibLookupTrackerTest {
@@ -26,36 +26,36 @@ public class JsKlibLookupTrackerTestGenerated extends AbstractJsKlibLookupTracke
     }
 
     public void testAllFilesPresentInJsKlib() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/jsKlib"), Pattern.compile("^([^\\.]+)$"), null, false);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib"), Pattern.compile("^([^\\.]+)$"), null, false);
     }
 
     @TestMetadata("classifierMembers")
     public void testClassifierMembers() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/");
     }
 
     @TestMetadata("conventions")
     public void testConventions() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/");
     }
 
     @TestMetadata("expressionType")
     public void testExpressionType() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/");
     }
 
     @TestMetadata("localDeclarations")
     public void testLocalDeclarations() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/");
     }
 
     @TestMetadata("packageDeclarations")
     public void testPackageDeclarations() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/");
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/");
     }
 }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java

@@ -17,7 +17,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/lookupTracker/js")
+@TestMetadata("jps/jps-plugin/testData/incremental/lookupTracker/js")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JsLookupTrackerTestGenerated extends AbstractJsLookupTrackerTest {
@@ -26,36 +26,36 @@ public class JsLookupTrackerTestGenerated extends AbstractJsLookupTrackerTest {
     }
 
     public void testAllFilesPresentInJs() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/js"), Pattern.compile("^([^\\.]+)$"), null, false);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lookupTracker/js"), Pattern.compile("^([^\\.]+)$"), null, false);
     }
 
     @TestMetadata("classifierMembers")
     public void testClassifierMembers() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/");
     }
 
     @TestMetadata("conventions")
     public void testConventions() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/js/conventions/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/");
     }
 
     @TestMetadata("expressionType")
     public void testExpressionType() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/js/expressionType/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/");
     }
 
     @TestMetadata("localDeclarations")
     public void testLocalDeclarations() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/");
     }
 
     @TestMetadata("packageDeclarations")
     public void testPackageDeclarations() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/");
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/js/simple/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/simple/");
     }
 }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java

@@ -17,7 +17,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/lookupTracker/jvm")
+@TestMetadata("jps/jps-plugin/testData/incremental/lookupTracker/jvm")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JvmLookupTrackerTestGenerated extends AbstractJvmLookupTrackerTest {
@@ -26,51 +26,51 @@ public class JvmLookupTrackerTestGenerated extends AbstractJvmLookupTrackerTest
     }
 
     public void testAllFilesPresentInJvm() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/jvm"), Pattern.compile("^([^\\.]+)$"), null, false);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lookupTracker/jvm"), Pattern.compile("^([^\\.]+)$"), null, false);
     }
 
     @TestMetadata("classifierMembers")
     public void testClassifierMembers() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/");
     }
 
     @TestMetadata("conventions")
     public void testConventions() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/conventions/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/");
     }
 
     @TestMetadata("expressionType")
     public void testExpressionType() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/");
     }
 
     @TestMetadata("java")
     public void testJava() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/java/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/");
     }
 
     @TestMetadata("localDeclarations")
     public void testLocalDeclarations() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/");
     }
 
     @TestMetadata("packageDeclarations")
     public void testPackageDeclarations() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/");
     }
 
     @TestMetadata("SAM")
     public void testSAM() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/SAM/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/");
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/simple/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/");
     }
 
     @TestMetadata("syntheticProperties")
     public void testSyntheticProperties() throws Exception {
-        runTest("jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/");
+        runTest("jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/");
     }
 }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java

@@ -17,7 +17,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/multiModule/multiplatform/withGeneratedContent")
+@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -26,10 +26,10 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
     }
 
     public void testAllFilesPresentInMultiplatformMultiModule() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent"), Pattern.compile("^([^\\.]+)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Simple extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -38,20 +38,20 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
         }
 
         public void testAllFilesPresentInSimple() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("editingPJvmJava")
         public void testEditingPJvmJava() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/");
         }
 
         @TestMetadata("editingPJvmKotlin")
         public void testEditingPJvmKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingPJvmJava extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -60,11 +60,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingPJvmJava() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingPJvmKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -73,12 +73,12 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingPJvmKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleJsJvmProjectWithTests extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -87,20 +87,20 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
         }
 
         public void testAllFilesPresentInSimpleJsJvmProjectWithTests() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("editingCMainExpectActual")
         public void testEditingCMainExpectActual() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/");
         }
 
         @TestMetadata("editingCTestsExpectActual")
         public void testEditingCTestsExpectActual() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingCMainExpectActual extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -109,11 +109,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingCMainExpectActual() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingCTestsExpectActual extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -122,12 +122,12 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingCTestsExpectActual() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SimpleNewMpp extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -136,20 +136,20 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
         }
 
         public void testAllFilesPresentInSimpleNewMpp() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("editingPJvmJava")
         public void testEditingPJvmJava() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/");
         }
 
         @TestMetadata("editingPJvmKotlin")
         public void testEditingPJvmKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingPJvmJava extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -158,11 +158,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingPJvmJava() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingPJvmKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -171,12 +171,12 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingPJvmKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate")
+    @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Ultimate extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -185,55 +185,55 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
         }
 
         public void testAllFilesPresentInUltimate() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("editingACommonExpectActual")
         public void testEditingACommonExpectActual() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/");
         }
 
         @TestMetadata("editingAJsClientKotlin")
         public void testEditingAJsClientKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/");
         }
 
         @TestMetadata("editingAJvmClientJava")
         public void testEditingAJvmClientJava() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/");
         }
 
         @TestMetadata("editingAJvmClientKotlin")
         public void testEditingAJvmClientKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/");
         }
 
         @TestMetadata("editingBCommonExpectActual")
         public void testEditingBCommonExpectActual() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/");
         }
 
         @TestMetadata("editingRJsKotlin")
         public void testEditingRJsKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/");
         }
 
         @TestMetadata("editingRJvmKotlin")
         public void testEditingRJvmKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/");
         }
 
         @TestMetadata("editingRaJsKotlin")
         public void testEditingRaJsKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/");
         }
 
         @TestMetadata("editingRaJvmKotlin")
         public void testEditingRaJvmKotlin() throws Exception {
-            runTest("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/");
+            runTest("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/");
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingACommonExpectActual extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -242,11 +242,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingACommonExpectActual() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingAJsClientKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -255,11 +255,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingAJsClientKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingAJvmClientJava extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -268,11 +268,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingAJvmClientJava() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingAJvmClientKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -281,11 +281,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingAJvmClientKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingBCommonExpectActual extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -294,11 +294,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingBCommonExpectActual() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingRJsKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -307,11 +307,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingRJsKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingRJvmKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -320,11 +320,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingRJvmKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingRaJsKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -333,11 +333,11 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingRaJsKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin")
+        @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class EditingRaJvmKotlin extends AbstractMultiplatformJpsTestWithGeneratedContent {
@@ -346,7 +346,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM
             }
 
             public void testAllFilesPresentInEditingRaJvmKotlin() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java

@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTest {
-    @TestMetadata("jps-plugin/testData/comparison/classSignatureChange")
+    @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassSignatureChange extends AbstractJsProtoComparisonTest {
@@ -28,65 +28,65 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
         }
 
         public void testAllFilesPresentInClassSignatureChange() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("classAnnotationListChanged")
         public void testClassAnnotationListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/");
         }
 
         @TestMetadata("classFlagsAndMembersChanged")
         public void testClassFlagsAndMembersChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/");
         }
 
         @TestMetadata("classFlagsChanged")
         public void testClassFlagsChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/");
         }
 
         @TestMetadata("classTypeParameterListChanged")
         public void testClassTypeParameterListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/");
         }
 
         @TestMetadata("classWithSuperTypeListChanged")
         public void testClassWithSuperTypeListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/");
         }
 
         @TestMetadata("nestedClassSignatureChanged")
         public void testNestedClassSignatureChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/");
         }
 
         @TestMetadata("sealedClassImplAdded")
         public void testSealedClassImplAdded() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/");
         }
 
         @TestMetadata("sealedClassImplRemoved")
         public void testSealedClassImplRemoved() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/");
         }
 
         @TestMetadata("sealedClassNestedImplAdded")
         public void testSealedClassNestedImplAdded() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/");
         }
 
         @TestMetadata("sealedClassNestedImplAddedDeep")
         public void testSealedClassNestedImplAddedDeep() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/");
         }
 
         @TestMetadata("sealedClassNestedImplRemoved")
         public void testSealedClassNestedImplRemoved() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassAnnotationListChanged extends AbstractJsProtoComparisonTest {
@@ -95,11 +95,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassAnnotationListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassFlagsAndMembersChanged extends AbstractJsProtoComparisonTest {
@@ -108,11 +108,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassFlagsAndMembersChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassFlagsChanged extends AbstractJsProtoComparisonTest {
@@ -121,11 +121,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassFlagsChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassTypeParameterListChanged extends AbstractJsProtoComparisonTest {
@@ -134,11 +134,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassTypeParameterListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithSuperTypeListChanged extends AbstractJsProtoComparisonTest {
@@ -147,11 +147,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithSuperTypeListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NestedClassSignatureChanged extends AbstractJsProtoComparisonTest {
@@ -160,11 +160,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInNestedClassSignatureChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassImplAdded extends AbstractJsProtoComparisonTest {
@@ -173,11 +173,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInSealedClassImplAdded() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassImplRemoved extends AbstractJsProtoComparisonTest {
@@ -186,11 +186,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInSealedClassImplRemoved() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassNestedImplAdded extends AbstractJsProtoComparisonTest {
@@ -199,11 +199,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInSealedClassNestedImplAdded() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassNestedImplAddedDeep extends AbstractJsProtoComparisonTest {
@@ -212,11 +212,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInSealedClassNestedImplAddedDeep() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassNestedImplRemoved extends AbstractJsProtoComparisonTest {
@@ -225,12 +225,12 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInSealedClassNestedImplRemoved() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange")
+    @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassPrivateOnlyChange extends AbstractJsProtoComparisonTest {
@@ -239,35 +239,35 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
         }
 
         public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("classWithPrivateFunChanged")
         public void testClassWithPrivateFunChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/");
         }
 
         @TestMetadata("classWithPrivatePrimaryConstructorChanged")
         public void testClassWithPrivatePrimaryConstructorChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/");
         }
 
         @TestMetadata("classWithPrivateSecondaryConstructorChanged")
         public void testClassWithPrivateSecondaryConstructorChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/");
         }
 
         @TestMetadata("classWithPrivateValChanged")
         public void testClassWithPrivateValChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/");
         }
 
         @TestMetadata("classWithPrivateVarChanged")
         public void testClassWithPrivateVarChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateFunChanged extends AbstractJsProtoComparisonTest {
@@ -276,11 +276,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithPrivateFunChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivatePrimaryConstructorChanged extends AbstractJsProtoComparisonTest {
@@ -289,11 +289,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithPrivatePrimaryConstructorChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateSecondaryConstructorChanged extends AbstractJsProtoComparisonTest {
@@ -302,11 +302,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithPrivateSecondaryConstructorChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateValChanged extends AbstractJsProtoComparisonTest {
@@ -315,11 +315,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithPrivateValChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateVarChanged extends AbstractJsProtoComparisonTest {
@@ -328,12 +328,12 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithPrivateVarChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged")
+    @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassMembersOnlyChanged extends AbstractJsProtoComparisonTest {
@@ -342,60 +342,60 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
         }
 
         public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("classWithCompanionObjectChanged")
         public void testClassWithCompanionObjectChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/");
         }
 
         @TestMetadata("classWithConstructorChanged")
         public void testClassWithConstructorChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/");
         }
 
         @TestMetadata("classWithFunAndValChanged")
         public void testClassWithFunAndValChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/");
         }
 
         @TestMetadata("classWithNestedClassesChanged")
         public void testClassWithNestedClassesChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/");
         }
 
         @TestMetadata("classWitnEnumChanged")
         public void testClassWitnEnumChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/");
         }
 
         @TestMetadata("defaultValues")
         public void testDefaultValues() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/");
         }
 
         @TestMetadata("membersAnnotationListChanged")
         public void testMembersAnnotationListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/");
         }
 
         @TestMetadata("membersFlagsChanged")
         public void testMembersFlagsChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/");
         }
 
         @TestMetadata("nestedClassMembersChanged")
         public void testNestedClassMembersChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/");
         }
 
         @TestMetadata("sealedClassImplAdded")
         public void testSealedClassImplAdded() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithCompanionObjectChanged extends AbstractJsProtoComparisonTest {
@@ -404,11 +404,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithCompanionObjectChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithConstructorChanged extends AbstractJsProtoComparisonTest {
@@ -417,11 +417,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithConstructorChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithFunAndValChanged extends AbstractJsProtoComparisonTest {
@@ -430,11 +430,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithFunAndValChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithNestedClassesChanged extends AbstractJsProtoComparisonTest {
@@ -443,11 +443,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWithNestedClassesChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWitnEnumChanged extends AbstractJsProtoComparisonTest {
@@ -456,11 +456,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInClassWitnEnumChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class DefaultValues extends AbstractJsProtoComparisonTest {
@@ -469,11 +469,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInDefaultValues() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersAnnotationListChanged extends AbstractJsProtoComparisonTest {
@@ -482,11 +482,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersFlagsChanged extends AbstractJsProtoComparisonTest {
@@ -495,11 +495,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInMembersFlagsChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NestedClassMembersChanged extends AbstractJsProtoComparisonTest {
@@ -508,11 +508,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInNestedClassMembersChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassImplAdded extends AbstractJsProtoComparisonTest {
@@ -521,12 +521,12 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInSealedClassImplAdded() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/packageMembers")
+    @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PackageMembers extends AbstractJsProtoComparisonTest {
@@ -535,35 +535,35 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
         }
 
         public void testAllFilesPresentInPackageMembers() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("defaultValues")
         public void testDefaultValues() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/defaultValues/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/defaultValues/");
         }
 
         @TestMetadata("membersAnnotationListChanged")
         public void testMembersAnnotationListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged/");
         }
 
         @TestMetadata("membersFlagsChanged")
         public void testMembersFlagsChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/");
         }
 
         @TestMetadata("packageFacadePrivateOnlyChanges")
         public void testPackageFacadePrivateOnlyChanges() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/");
         }
 
         @TestMetadata("packageFacadePublicChanges")
         public void testPackageFacadePublicChanges() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/defaultValues")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/defaultValues")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class DefaultValues extends AbstractJsProtoComparisonTest {
@@ -572,11 +572,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInDefaultValues() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersAnnotationListChanged extends AbstractJsProtoComparisonTest {
@@ -585,11 +585,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersFlagsChanged extends AbstractJsProtoComparisonTest {
@@ -598,11 +598,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInMembersFlagsChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class PackageFacadePrivateOnlyChanges extends AbstractJsProtoComparisonTest {
@@ -611,11 +611,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInPackageFacadePrivateOnlyChanges() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class PackageFacadePublicChanges extends AbstractJsProtoComparisonTest {
@@ -624,12 +624,12 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInPackageFacadePublicChanges() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/unchanged")
+    @TestMetadata("jps/jps-plugin/testData/comparison/unchanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Unchanged extends AbstractJsProtoComparisonTest {
@@ -638,20 +638,20 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
         }
 
         public void testAllFilesPresentInUnchanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("unchangedClass")
         public void testUnchangedClass() throws Exception {
-            runTest("jps-plugin/testData/comparison/unchanged/unchangedClass/");
+            runTest("jps/jps-plugin/testData/comparison/unchanged/unchangedClass/");
         }
 
         @TestMetadata("unchangedPackageFacade")
         public void testUnchangedPackageFacade() throws Exception {
-            runTest("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/");
+            runTest("jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/unchanged/unchangedClass")
+        @TestMetadata("jps/jps-plugin/testData/comparison/unchanged/unchangedClass")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class UnchangedClass extends AbstractJsProtoComparisonTest {
@@ -660,11 +660,11 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInUnchangedClass() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade")
+        @TestMetadata("jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class UnchangedPackageFacade extends AbstractJsProtoComparisonTest {
@@ -673,12 +673,12 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInUnchangedPackageFacade() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/jsOnly")
+    @TestMetadata("jps/jps-plugin/testData/comparison/jsOnly")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JsOnly extends AbstractJsProtoComparisonTest {
@@ -687,15 +687,15 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
         }
 
         public void testAllFilesPresentInJsOnly() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jsOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/jsOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("externals")
         public void testExternals() throws Exception {
-            runTest("jps-plugin/testData/comparison/jsOnly/externals/");
+            runTest("jps/jps-plugin/testData/comparison/jsOnly/externals/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/jsOnly/externals")
+        @TestMetadata("jps/jps-plugin/testData/comparison/jsOnly/externals")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Externals extends AbstractJsProtoComparisonTest {
@@ -704,7 +704,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes
             }
 
             public void testAllFilesPresentInExternals() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jsOnly/externals"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/jsOnly/externals"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java

@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonTest {
-    @TestMetadata("jps-plugin/testData/comparison/classSignatureChange")
+    @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassSignatureChange extends AbstractJvmProtoComparisonTest {
@@ -28,65 +28,65 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
         }
 
         public void testAllFilesPresentInClassSignatureChange() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("classAnnotationListChanged")
         public void testClassAnnotationListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/");
         }
 
         @TestMetadata("classFlagsAndMembersChanged")
         public void testClassFlagsAndMembersChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/");
         }
 
         @TestMetadata("classFlagsChanged")
         public void testClassFlagsChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/");
         }
 
         @TestMetadata("classTypeParameterListChanged")
         public void testClassTypeParameterListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/");
         }
 
         @TestMetadata("classWithSuperTypeListChanged")
         public void testClassWithSuperTypeListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/");
         }
 
         @TestMetadata("nestedClassSignatureChanged")
         public void testNestedClassSignatureChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/");
         }
 
         @TestMetadata("sealedClassImplAdded")
         public void testSealedClassImplAdded() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/");
         }
 
         @TestMetadata("sealedClassImplRemoved")
         public void testSealedClassImplRemoved() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/");
         }
 
         @TestMetadata("sealedClassNestedImplAdded")
         public void testSealedClassNestedImplAdded() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/");
         }
 
         @TestMetadata("sealedClassNestedImplAddedDeep")
         public void testSealedClassNestedImplAddedDeep() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/");
         }
 
         @TestMetadata("sealedClassNestedImplRemoved")
         public void testSealedClassNestedImplRemoved() throws Exception {
-            runTest("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/");
+            runTest("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassAnnotationListChanged extends AbstractJvmProtoComparisonTest {
@@ -95,11 +95,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassAnnotationListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassFlagsAndMembersChanged extends AbstractJvmProtoComparisonTest {
@@ -108,11 +108,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassFlagsAndMembersChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassFlagsChanged extends AbstractJvmProtoComparisonTest {
@@ -121,11 +121,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassFlagsChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassTypeParameterListChanged extends AbstractJvmProtoComparisonTest {
@@ -134,11 +134,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassTypeParameterListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithSuperTypeListChanged extends AbstractJvmProtoComparisonTest {
@@ -147,11 +147,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithSuperTypeListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NestedClassSignatureChanged extends AbstractJvmProtoComparisonTest {
@@ -160,11 +160,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInNestedClassSignatureChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassImplAdded extends AbstractJvmProtoComparisonTest {
@@ -173,11 +173,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInSealedClassImplAdded() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassImplRemoved extends AbstractJvmProtoComparisonTest {
@@ -186,11 +186,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInSealedClassImplRemoved() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassNestedImplAdded extends AbstractJvmProtoComparisonTest {
@@ -199,11 +199,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInSealedClassNestedImplAdded() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassNestedImplAddedDeep extends AbstractJvmProtoComparisonTest {
@@ -212,11 +212,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInSealedClassNestedImplAddedDeep() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassNestedImplRemoved extends AbstractJvmProtoComparisonTest {
@@ -225,12 +225,12 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInSealedClassNestedImplRemoved() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange")
+    @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassPrivateOnlyChange extends AbstractJvmProtoComparisonTest {
@@ -239,35 +239,35 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
         }
 
         public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("classWithPrivateFunChanged")
         public void testClassWithPrivateFunChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/");
         }
 
         @TestMetadata("classWithPrivatePrimaryConstructorChanged")
         public void testClassWithPrivatePrimaryConstructorChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/");
         }
 
         @TestMetadata("classWithPrivateSecondaryConstructorChanged")
         public void testClassWithPrivateSecondaryConstructorChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/");
         }
 
         @TestMetadata("classWithPrivateValChanged")
         public void testClassWithPrivateValChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/");
         }
 
         @TestMetadata("classWithPrivateVarChanged")
         public void testClassWithPrivateVarChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateFunChanged extends AbstractJvmProtoComparisonTest {
@@ -276,11 +276,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithPrivateFunChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivatePrimaryConstructorChanged extends AbstractJvmProtoComparisonTest {
@@ -289,11 +289,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithPrivatePrimaryConstructorChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateSecondaryConstructorChanged extends AbstractJvmProtoComparisonTest {
@@ -302,11 +302,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithPrivateSecondaryConstructorChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateValChanged extends AbstractJvmProtoComparisonTest {
@@ -315,11 +315,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithPrivateValChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithPrivateVarChanged extends AbstractJvmProtoComparisonTest {
@@ -328,12 +328,12 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithPrivateVarChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged")
+    @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassMembersOnlyChanged extends AbstractJvmProtoComparisonTest {
@@ -342,60 +342,60 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
         }
 
         public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("classWithCompanionObjectChanged")
         public void testClassWithCompanionObjectChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/");
         }
 
         @TestMetadata("classWithConstructorChanged")
         public void testClassWithConstructorChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/");
         }
 
         @TestMetadata("classWithFunAndValChanged")
         public void testClassWithFunAndValChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/");
         }
 
         @TestMetadata("classWithNestedClassesChanged")
         public void testClassWithNestedClassesChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/");
         }
 
         @TestMetadata("classWitnEnumChanged")
         public void testClassWitnEnumChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/");
         }
 
         @TestMetadata("defaultValues")
         public void testDefaultValues() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/");
         }
 
         @TestMetadata("membersAnnotationListChanged")
         public void testMembersAnnotationListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/");
         }
 
         @TestMetadata("membersFlagsChanged")
         public void testMembersFlagsChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/");
         }
 
         @TestMetadata("nestedClassMembersChanged")
         public void testNestedClassMembersChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/");
         }
 
         @TestMetadata("sealedClassImplAdded")
         public void testSealedClassImplAdded() throws Exception {
-            runTest("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/");
+            runTest("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithCompanionObjectChanged extends AbstractJvmProtoComparisonTest {
@@ -404,11 +404,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithCompanionObjectChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithConstructorChanged extends AbstractJvmProtoComparisonTest {
@@ -417,11 +417,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithConstructorChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithFunAndValChanged extends AbstractJvmProtoComparisonTest {
@@ -430,11 +430,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithFunAndValChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWithNestedClassesChanged extends AbstractJvmProtoComparisonTest {
@@ -443,11 +443,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWithNestedClassesChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassWitnEnumChanged extends AbstractJvmProtoComparisonTest {
@@ -456,11 +456,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassWitnEnumChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class DefaultValues extends AbstractJvmProtoComparisonTest {
@@ -469,11 +469,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInDefaultValues() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersAnnotationListChanged extends AbstractJvmProtoComparisonTest {
@@ -482,11 +482,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersFlagsChanged extends AbstractJvmProtoComparisonTest {
@@ -495,11 +495,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInMembersFlagsChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NestedClassMembersChanged extends AbstractJvmProtoComparisonTest {
@@ -508,11 +508,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInNestedClassMembersChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded")
+        @TestMetadata("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class SealedClassImplAdded extends AbstractJvmProtoComparisonTest {
@@ -521,12 +521,12 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInSealedClassImplAdded() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/packageMembers")
+    @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PackageMembers extends AbstractJvmProtoComparisonTest {
@@ -535,35 +535,35 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
         }
 
         public void testAllFilesPresentInPackageMembers() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("defaultValues")
         public void testDefaultValues() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/defaultValues/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/defaultValues/");
         }
 
         @TestMetadata("membersAnnotationListChanged")
         public void testMembersAnnotationListChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged/");
         }
 
         @TestMetadata("membersFlagsChanged")
         public void testMembersFlagsChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/");
         }
 
         @TestMetadata("packageFacadePrivateOnlyChanges")
         public void testPackageFacadePrivateOnlyChanges() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/");
         }
 
         @TestMetadata("packageFacadePublicChanges")
         public void testPackageFacadePublicChanges() throws Exception {
-            runTest("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/");
+            runTest("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/defaultValues")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/defaultValues")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class DefaultValues extends AbstractJvmProtoComparisonTest {
@@ -572,11 +572,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInDefaultValues() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersAnnotationListChanged extends AbstractJvmProtoComparisonTest {
@@ -585,11 +585,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersFlagsChanged extends AbstractJvmProtoComparisonTest {
@@ -598,11 +598,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInMembersFlagsChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class PackageFacadePrivateOnlyChanges extends AbstractJvmProtoComparisonTest {
@@ -611,11 +611,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInPackageFacadePrivateOnlyChanges() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges")
+        @TestMetadata("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class PackageFacadePublicChanges extends AbstractJvmProtoComparisonTest {
@@ -624,12 +624,12 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInPackageFacadePublicChanges() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/unchanged")
+    @TestMetadata("jps/jps-plugin/testData/comparison/unchanged")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Unchanged extends AbstractJvmProtoComparisonTest {
@@ -638,20 +638,20 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
         }
 
         public void testAllFilesPresentInUnchanged() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("unchangedClass")
         public void testUnchangedClass() throws Exception {
-            runTest("jps-plugin/testData/comparison/unchanged/unchangedClass/");
+            runTest("jps/jps-plugin/testData/comparison/unchanged/unchangedClass/");
         }
 
         @TestMetadata("unchangedPackageFacade")
         public void testUnchangedPackageFacade() throws Exception {
-            runTest("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/");
+            runTest("jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/unchanged/unchangedClass")
+        @TestMetadata("jps/jps-plugin/testData/comparison/unchanged/unchangedClass")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class UnchangedClass extends AbstractJvmProtoComparisonTest {
@@ -660,11 +660,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInUnchangedClass() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade")
+        @TestMetadata("jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class UnchangedPackageFacade extends AbstractJvmProtoComparisonTest {
@@ -673,12 +673,12 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInUnchangedPackageFacade() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }
 
-    @TestMetadata("jps-plugin/testData/comparison/jvmOnly")
+    @TestMetadata("jps/jps-plugin/testData/comparison/jvmOnly")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JvmOnly extends AbstractJvmProtoComparisonTest {
@@ -687,30 +687,30 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
         }
 
         public void testAllFilesPresentInJvmOnly() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/jvmOnly"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
 
         @TestMetadata("classToFileFacade")
         public void testClassToFileFacade() throws Exception {
-            runTest("jps-plugin/testData/comparison/jvmOnly/classToFileFacade/");
+            runTest("jps/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/");
         }
 
         @TestMetadata("membersFlagsChanged")
         public void testMembersFlagsChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/");
+            runTest("jps/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/");
         }
 
         @TestMetadata("packageFacadeMultifileClassChanged")
         public void testPackageFacadeMultifileClassChanged() throws Exception {
-            runTest("jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/");
+            runTest("jps/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/");
         }
 
         @TestMetadata("packageFacadeToClass")
         public void testPackageFacadeToClass() throws Exception {
-            runTest("jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/");
+            runTest("jps/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/");
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/jvmOnly/classToFileFacade")
+        @TestMetadata("jps/jps-plugin/testData/comparison/jvmOnly/classToFileFacade")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ClassToFileFacade extends AbstractJvmProtoComparisonTest {
@@ -719,11 +719,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInClassToFileFacade() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/classToFileFacade"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/jvmOnly/classToFileFacade"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MembersFlagsChanged extends AbstractJvmProtoComparisonTest {
@@ -732,11 +732,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInMembersFlagsChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged")
+        @TestMetadata("jps/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class PackageFacadeMultifileClassChanged extends AbstractJvmProtoComparisonTest {
@@ -745,11 +745,11 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInPackageFacadeMultifileClassChanged() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
 
-        @TestMetadata("jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass")
+        @TestMetadata("jps/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class PackageFacadeToClass extends AbstractJvmProtoComparisonTest {
@@ -758,7 +758,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT
             }
 
             public void testAllFilesPresentInPackageFacadeToClass() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, true);
             }
         }
     }