From 0a5fe3ef7c5ee4c987db587093ab4118ec1d7a98 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 13 Jul 2017 08:06:16 +0300 Subject: [PATCH] Move JVM specific IC tests with class hierarchy changes --- ...ementalJvmCompilerRunnerTestGenerated.java | 30 ++++++++++ .../build/IncrementalJpsTestGenerated.java | 60 +++++++++---------- .../other}/classToPackageFacade/A.kt | 0 .../other}/classToPackageFacade/A.kt.delete.1 | 0 .../other}/classToPackageFacade/AChild.kt | 0 .../classToPackageFacade/AChild.kt.new.2 | 0 .../classToPackageFacade/APartF.kt.new.1 | 0 .../classToPackageFacade/APartG.kt.new.1 | 0 .../other}/classToPackageFacade/build.log | 0 .../other}/classToPackageFacade/getA.kt | 0 .../classToPackageFacade/getA.kt.delete.2 | 0 .../other}/classToPackageFacade/getAChild.kt | 0 .../other}/classToPackageFacade/useF.kt | 0 .../other}/classToPackageFacade/useF.kt.new.2 | 0 .../other}/classToPackageFacade/useG.kt | 0 .../other}/classToPackageFacade/useG.kt.new.2 | 0 .../other}/classToPackageFacade/useH.kt | 0 .../classToPackageFacade/useH.kt.delete.2 | 0 .../other}/classToPackageFacade/useJ.kt | 0 .../Introspector.kt | 0 .../IntrospectorImpl.kt.new | 0 .../Model.java | 0 .../ModelModifier.java | 0 .../build.log | 0 .../other}/jvmNameChanged/A.kt | 0 .../other}/jvmNameChanged/A.kt.new | 0 .../other}/jvmNameChanged/AChild.kt | 0 .../other}/jvmNameChanged/build.log | 0 .../other}/jvmNameChanged/useAChild.kt | 0 .../multifilePackagePartMethodAdded/build.log | 0 .../multifilePackagePartMethodAdded/partA.kt | 0 .../multifilePackagePartMethodAdded/partB.kt | 0 .../partB.kt.new.1 | 0 .../multifilePackagePartMethodAdded/partC.kt | 0 .../useFooF.kt | 0 .../useFooG.kt | 0 .../useFooH.kt | 0 .../other}/packageFacadeToClass/A.kt.new.1 | 0 .../other}/packageFacadeToClass/AA.kt | 0 .../other}/packageFacadeToClass/APartF.kt | 0 .../packageFacadeToClass/APartF.kt.delete.1 | 0 .../other}/packageFacadeToClass/APartG.kt | 0 .../packageFacadeToClass/APartG.kt.delete.1 | 0 .../other}/packageFacadeToClass/UseFJava.java | 0 .../other}/packageFacadeToClass/build.log | 0 .../other}/packageFacadeToClass/useAA.kt | 0 .../other}/packageFacadeToClass/useF.kt | 0 .../other}/packageFacadeToClass/useF.kt.new.2 | 0 .../other}/packageFacadeToClass/useG.kt | 0 .../other}/packageFacadeToClass/useG.kt.new.2 | 0 50 files changed, 60 insertions(+), 30 deletions(-) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/A.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/A.kt.delete.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/AChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/AChild.kt.new.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/APartF.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/APartG.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/getA.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/getA.kt.delete.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/getAChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/useF.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/useF.kt.new.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/useG.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/useG.kt.new.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/useH.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/useH.kt.delete.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/classToPackageFacade/useJ.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/innerClassNotGeneratedWhenRebuilding/Introspector.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/innerClassNotGeneratedWhenRebuilding/Model.java (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/innerClassNotGeneratedWhenRebuilding/ModelModifier.java (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/innerClassNotGeneratedWhenRebuilding/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/jvmNameChanged/A.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/jvmNameChanged/A.kt.new (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/jvmNameChanged/AChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/jvmNameChanged/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/jvmNameChanged/useAChild.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/partA.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/partB.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/partB.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/partC.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/useFooF.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/useFooG.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/multifilePackagePartMethodAdded/useFooH.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/A.kt.new.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/AA.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/APartF.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/APartF.kt.delete.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/APartG.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/APartG.kt.delete.1 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/UseFJava.java (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/build.log (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/useAA.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/useF.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/useF.kt.new.2 (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/useG.kt (100%) rename jps-plugin/testData/incremental/{classHierarchyAffected => withJava/other}/packageFacadeToClass/useG.kt.new.2 (100%) diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java index ae6abd03eb3..06b1af4f046 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java @@ -1078,6 +1078,12 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } + @TestMetadata("classToPackageFacade") + public void testClassToPackageFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/classToPackageFacade/"); + doTest(fileName); + } + @TestMetadata("conflictingPlatformDeclarations") public void testConflictingPlatformDeclarations() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/"); @@ -1096,6 +1102,18 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } + @TestMetadata("innerClassNotGeneratedWhenRebuilding") + public void testInnerClassNotGeneratedWhenRebuilding() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/"); + doTest(fileName); + } + + @TestMetadata("jvmNameChanged") + public void testJvmNameChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/jvmNameChanged/"); + doTest(fileName); + } + @TestMetadata("mainRedeclaration") public void testMainRedeclaration() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/mainRedeclaration/"); @@ -1156,12 +1174,24 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } + @TestMetadata("multifilePackagePartMethodAdded") + public void testMultifilePackagePartMethodAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/"); + doTest(fileName); + } + @TestMetadata("optionalParameter") public void testOptionalParameter() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/optionalParameter/"); doTest(fileName); } + @TestMetadata("packageFacadeToClass") + public void testPackageFacadeToClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/"); + doTest(fileName); + } + @TestMetadata("packageMultifileClassOneFileWithPublicChanges") public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/"); 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 1dfe3b15f5e..6189ddf2a6f 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 @@ -1156,6 +1156,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } + @TestMetadata("classToPackageFacade") + public void testClassToPackageFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/classToPackageFacade/"); + doTest(fileName); + } + @TestMetadata("conflictingPlatformDeclarations") public void testConflictingPlatformDeclarations() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/"); @@ -1174,6 +1180,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("innerClassNotGeneratedWhenRebuilding") + public void testInnerClassNotGeneratedWhenRebuilding() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/"); + doTest(fileName); + } + + @TestMetadata("jvmNameChanged") + public void testJvmNameChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/jvmNameChanged/"); + doTest(fileName); + } + @TestMetadata("mainRedeclaration") public void testMainRedeclaration() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/mainRedeclaration/"); @@ -1234,12 +1252,24 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("multifilePackagePartMethodAdded") + public void testMultifilePackagePartMethodAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/"); + doTest(fileName); + } + @TestMetadata("optionalParameter") public void testOptionalParameter() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/optionalParameter/"); doTest(fileName); } + @TestMetadata("packageFacadeToClass") + public void testPackageFacadeToClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/"); + doTest(fileName); + } + @TestMetadata("packageMultifileClassOneFileWithPublicChanges") public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/"); @@ -1421,12 +1451,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("classToPackageFacade") - public void testClassToPackageFacade() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/"); - doTest(fileName); - } - @TestMetadata("companionObjectInheritedMemberChanged") public void testCompanionObjectInheritedMemberChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/"); @@ -1505,18 +1529,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("innerClassNotGeneratedWhenRebuilding") - public void testInnerClassNotGeneratedWhenRebuilding() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/"); - doTest(fileName); - } - - @TestMetadata("jvmNameChanged") - public void testJvmNameChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/"); - doTest(fileName); - } - @TestMetadata("lambdaParameterAffected") public void testLambdaParameterAffected() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/"); @@ -1553,12 +1565,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("multifilePackagePartMethodAdded") - public void testMultifilePackagePartMethodAdded() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/"); - doTest(fileName); - } - @TestMetadata("overrideExplicit") public void testOverrideExplicit() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/"); @@ -1571,12 +1577,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("packageFacadeToClass") - public void testPackageFacadeToClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/"); - doTest(fileName); - } - @TestMetadata("propertyNullabilityChanged") public void testPropertyNullabilityChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/"); diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt.delete.1 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt.delete.1 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt.new.2 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt.new.2 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartF.kt.new.1 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartF.kt.new.1 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartG.kt.new.1 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartG.kt.new.1 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt.delete.2 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt.delete.2 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getAChild.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getAChild.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt.new.2 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt.new.2 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt.new.2 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt.new.2 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt.delete.2 b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt.delete.2 rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useJ.kt b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useJ.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useJ.kt rename to jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useJ.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/Introspector.kt b/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/Introspector.kt rename to jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new b/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new rename to jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/Model.java b/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/Model.java rename to jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/ModelModifier.java b/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/ModelModifier.java rename to jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/build.log b/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/innerClassNotGeneratedWhenRebuilding/build.log rename to jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt b/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt rename to jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new b/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt.new similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new rename to jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt.new diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt b/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/AChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt rename to jps-plugin/testData/incremental/withJava/other/jvmNameChanged/AChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log b/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log rename to jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt b/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt rename to jps-plugin/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partA.kt b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partA.kt rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt.new.1 b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt.new.1 rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partC.kt b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partC.kt rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooF.kt b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooF.kt rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooG.kt b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooG.kt rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooH.kt b/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooH.kt rename to jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/A.kt.new.1 b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/A.kt.new.1 rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/AA.kt b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/AA.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/AA.kt rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/AA.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt.delete.1 b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt.delete.1 rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt.delete.1 b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt.delete.1 rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/UseFJava.java b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/UseFJava.java rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/build.log similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/build.log diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useAA.kt b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useAA.kt rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt.new.2 b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt.new.2 rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt.new.2 b/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt.new.2 rename to jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2