From 23bc907d3fb13926fd0f43f2e77fe12a6dbd23ae Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 13 Jul 2017 07:40:44 +0300 Subject: [PATCH] Move multi-module IC tests to separate dir At the moment they are used only with JPS --- .../build/IncrementalJpsTestGenerated.java | 60 +++++++++---------- .../circular}/build.log | 0 .../circular}/dependencies.txt | 0 .../circular}/module1_A.kt | 0 .../circular}/module1_A.kt.new.1 | 0 .../circular}/module1_A.kt.new.2 | 0 .../circular}/module1_D.kt | 0 .../circular}/module2_B.kt | 0 .../circular}/module3_C.kt | 0 .../circular}/module4_E.kt | 0 .../circular}/module5_F.kt | 0 .../build.log | 0 .../dependencies.txt | 0 .../module1_A.kt | 0 .../module1_A.kt.new.1 | 0 .../module2_createADefault.kt | 0 .../module2_createANonDefault.kt | 0 .../module2_createANonDefault.kt.delete.2 | 0 .../build.log | 0 .../dependencies.txt | 0 .../module1_A.kt | 0 .../module1_A.kt.new.1 | 0 .../module2_createADefault.kt | 0 .../module2_createADefault.kt.delete.2 | 0 .../module2_createANonDefault.kt | 0 .../exportedDependency}/build.log | 0 .../exportedDependency}/dependencies.txt | 0 .../exportedDependency}/module1_A.kt | 0 .../exportedDependency}/module1_A.kt.new.1 | 0 .../exportedDependency}/module1_A.kt.new.2 | 0 .../exportedDependency}/module2_AChild.kt | 0 .../module3_AGrandChild.kt | 0 .../module3_importAGrandChild.kt | 0 .../module4_importAGrandChild.kt | 0 .../simple}/build.log | 0 .../simple}/dependencies.txt | 0 .../simple}/module1_A.kt | 0 .../simple}/module1_A.kt.new.1 | 0 .../simple}/module1_A.kt.new.2 | 0 .../simple}/module2_AChild.kt | 0 .../simple}/module2_importA.kt | 0 .../simple}/module3_importAChild.kt | 0 42 files changed, 30 insertions(+), 30 deletions(-) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module1_A.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module1_A.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module1_A.kt.new.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module1_D.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module2_B.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module3_C.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module4_E.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleCircular => multiModule/circular}/module5_F.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved => multiModule/defaultArgumentInConstructorRemoved}/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved => multiModule/defaultArgumentInConstructorRemoved}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved => multiModule/defaultArgumentInConstructorRemoved}/module1_A.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved => multiModule/defaultArgumentInConstructorRemoved}/module1_A.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved => multiModule/defaultArgumentInConstructorRemoved}/module2_createADefault.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved => multiModule/defaultArgumentInConstructorRemoved}/module2_createANonDefault.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved => multiModule/defaultArgumentInConstructorRemoved}/module2_createANonDefault.kt.delete.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved => multiModule/defaultValueInConstructorRemoved}/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved => multiModule/defaultValueInConstructorRemoved}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved => multiModule/defaultValueInConstructorRemoved}/module1_A.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved => multiModule/defaultValueInConstructorRemoved}/module1_A.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved => multiModule/defaultValueInConstructorRemoved}/module2_createADefault.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved => multiModule/defaultValueInConstructorRemoved}/module2_createADefault.kt.delete.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved => multiModule/defaultValueInConstructorRemoved}/module2_createANonDefault.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/module1_A.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/module1_A.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/module1_A.kt.new.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/module2_AChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/module3_AGrandChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/module3_importAGrandChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleExported => multiModule/exportedDependency}/module4_importAGrandChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/module1_A.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/module1_A.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/module1_A.kt.new.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/module2_AChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/module2_importA.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected/multiModuleSimple => multiModule/simple}/module3_importAChild.kt (100%) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 7751baa1f39..1dfe3b15f5e 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -38,6 +38,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } + @TestMetadata("circular") + public void testCircular() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circular/"); + doTest(fileName); + } + @TestMetadata("circularDependencyClasses") public void testCircularDependencyClasses() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); @@ -86,6 +92,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("defaultArgumentInConstructorRemoved") + public void testDefaultArgumentInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/"); + doTest(fileName); + } + @TestMetadata("defaultParameterAdded") public void testDefaultParameterAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAdded/"); @@ -110,6 +122,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("defaultValueInConstructorRemoved") + public void testDefaultValueInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("exportedDependency") + public void testExportedDependency() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/exportedDependency/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); @@ -128,6 +152,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("simple") + public void testSimple() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simple/"); + doTest(fileName); + } + @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); @@ -1523,36 +1553,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("multiModuleCircular") - public void testMultiModuleCircular() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/"); - doTest(fileName); - } - - @TestMetadata("multiModuleDefaultArgumentInConstructorRemoved") - public void testMultiModuleDefaultArgumentInConstructorRemoved() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/"); - doTest(fileName); - } - - @TestMetadata("multiModuleDefaultValueInConstructorRemoved") - public void testMultiModuleDefaultValueInConstructorRemoved() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/"); - doTest(fileName); - } - - @TestMetadata("multiModuleExported") - public void testMultiModuleExported() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/"); - doTest(fileName); - } - - @TestMetadata("multiModuleSimple") - public void testMultiModuleSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/"); - doTest(fileName); - } - @TestMetadata("multifilePackagePartMethodAdded") public void testMultifilePackagePartMethodAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/"); diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps-plugin/testData/incremental/multiModule/circular/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log rename to jps-plugin/testData/incremental/multiModule/circular/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt b/jps-plugin/testData/incremental/multiModule/circular/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/circular/dependencies.txt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt b/jps-plugin/testData/incremental/multiModule/circular/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/circular/module1_A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 b/jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt b/jps-plugin/testData/incremental/multiModule/circular/module1_D.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt rename to jps-plugin/testData/incremental/multiModule/circular/module1_D.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt b/jps-plugin/testData/incremental/multiModule/circular/module2_B.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt rename to jps-plugin/testData/incremental/multiModule/circular/module2_B.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt b/jps-plugin/testData/incremental/multiModule/circular/module3_C.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt rename to jps-plugin/testData/incremental/multiModule/circular/module3_C.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt b/jps-plugin/testData/incremental/multiModule/circular/module4_E.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt rename to jps-plugin/testData/incremental/multiModule/circular/module4_E.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt b/jps-plugin/testData/incremental/multiModule/circular/module5_F.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt rename to jps-plugin/testData/incremental/multiModule/circular/module5_F.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log rename to jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/dependencies.txt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createADefault.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt rename to jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createADefault.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt rename to jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 rename to jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log rename to jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/dependencies.txt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt rename to jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 rename to jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createANonDefault.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt rename to jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createANonDefault.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps-plugin/testData/incremental/multiModule/exportedDependency/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log rename to jps-plugin/testData/incremental/multiModule/exportedDependency/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt b/jps-plugin/testData/incremental/multiModule/exportedDependency/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/exportedDependency/dependencies.txt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt b/jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 b/jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt b/jps-plugin/testData/incremental/multiModule/exportedDependency/module2_AChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt rename to jps-plugin/testData/incremental/multiModule/exportedDependency/module2_AChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt b/jps-plugin/testData/incremental/multiModule/exportedDependency/module3_AGrandChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt rename to jps-plugin/testData/incremental/multiModule/exportedDependency/module3_AGrandChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt b/jps-plugin/testData/incremental/multiModule/exportedDependency/module3_importAGrandChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt rename to jps-plugin/testData/incremental/multiModule/exportedDependency/module3_importAGrandChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt b/jps-plugin/testData/incremental/multiModule/exportedDependency/module4_importAGrandChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt rename to jps-plugin/testData/incremental/multiModule/exportedDependency/module4_importAGrandChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps-plugin/testData/incremental/multiModule/simple/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log rename to jps-plugin/testData/incremental/multiModule/simple/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt b/jps-plugin/testData/incremental/multiModule/simple/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/simple/dependencies.txt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt b/jps-plugin/testData/incremental/multiModule/simple/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/simple/module1_A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 b/jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt b/jps-plugin/testData/incremental/multiModule/simple/module2_AChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt rename to jps-plugin/testData/incremental/multiModule/simple/module2_AChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt b/jps-plugin/testData/incremental/multiModule/simple/module2_importA.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt rename to jps-plugin/testData/incremental/multiModule/simple/module2_importA.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt b/jps-plugin/testData/incremental/multiModule/simple/module3_importAChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt rename to jps-plugin/testData/incremental/multiModule/simple/module3_importAChild.kt