diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java index 221539b4cbc..4fb72652363 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java @@ -174,12 +174,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("conflictingPlatformDeclarations") - public void testConflictingPlatformDeclarations() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); - doTest(fileName); - } - @TestMetadata("constantRemoved") public void testConstantRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); @@ -360,24 +354,12 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("inlineTopLevelFunctionWithJvmName") - public void testInlineTopLevelFunctionWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/"); - doTest(fileName); - } - @TestMetadata("inlineTopLevelValProperty") public void testInlineTopLevelValProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/"); doTest(fileName); } - @TestMetadata("inlineTopLevelValPropertyWithJvmName") - public void testInlineTopLevelValPropertyWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/"); - doTest(fileName); - } - @TestMetadata("inlineTopLevelVarProperty") public void testInlineTopLevelVarProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/"); @@ -432,12 +414,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("mainRedeclaration") - public void testMainRedeclaration() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/"); - doTest(fileName); - } - @TestMetadata("moveClass") public void testMoveClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); @@ -456,60 +432,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("multifileClassAddTopLevelFunWithDefault") - public void testMultifileClassAddTopLevelFunWithDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileAdded") - public void testMultifileClassFileAdded() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileChanged") - public void testMultifileClassFileChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") - public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); - doTest(fileName); - } - - @TestMetadata("multifileClassInlineFunction") - public void testMultifileClassInlineFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); - doTest(fileName); - } - - @TestMetadata("multifileClassInlineFunctionAccessingField") - public void testMultifileClassInlineFunctionAccessingField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRecreated") - public void testMultifileClassRecreated() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRecreatedAfterRenaming") - public void testMultifileClassRecreatedAfterRenaming() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRemoved") - public void testMultifileClassRemoved() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); - doTest(fileName); - } - @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); @@ -522,12 +444,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("optionalParameter") - public void testOptionalParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); - doTest(fileName); - } - @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); @@ -582,18 +498,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("packageMultifileClassOneFileWithPublicChanges") - public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); - doTest(fileName); - } - - @TestMetadata("packageMultifileClassPrivateOnlyChanged") - public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); - doTest(fileName); - } - @TestMetadata("packagePrivateOnlyChanged") public void testPackagePrivateOnlyChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); @@ -708,12 +612,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade") - public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/"); - doTest(fileName); - } - @TestMetadata("removeAndRestoreCompanion") public void testRemoveAndRestoreCompanion() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/"); @@ -804,12 +702,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("topLevelFunctionWithJvmName") - public void testTopLevelFunctionWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/"); - doTest(fileName); - } - @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); @@ -822,12 +714,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("topLevelPropertyWithJvmName") - public void testTopLevelPropertyWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/"); - doTest(fileName); - } - @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); 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 38a966140fe..ae6abd03eb3 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 @@ -176,12 +176,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("conflictingPlatformDeclarations") - public void testConflictingPlatformDeclarations() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); - doTest(fileName); - } - @TestMetadata("constantRemoved") public void testConstantRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); @@ -362,24 +356,12 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("inlineTopLevelFunctionWithJvmName") - public void testInlineTopLevelFunctionWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/"); - doTest(fileName); - } - @TestMetadata("inlineTopLevelValProperty") public void testInlineTopLevelValProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/"); doTest(fileName); } - @TestMetadata("inlineTopLevelValPropertyWithJvmName") - public void testInlineTopLevelValPropertyWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/"); - doTest(fileName); - } - @TestMetadata("inlineTopLevelVarProperty") public void testInlineTopLevelVarProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/"); @@ -434,12 +416,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("mainRedeclaration") - public void testMainRedeclaration() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/"); - doTest(fileName); - } - @TestMetadata("moveClass") public void testMoveClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); @@ -458,60 +434,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("multifileClassAddTopLevelFunWithDefault") - public void testMultifileClassAddTopLevelFunWithDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileAdded") - public void testMultifileClassFileAdded() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileChanged") - public void testMultifileClassFileChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") - public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); - doTest(fileName); - } - - @TestMetadata("multifileClassInlineFunction") - public void testMultifileClassInlineFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); - doTest(fileName); - } - - @TestMetadata("multifileClassInlineFunctionAccessingField") - public void testMultifileClassInlineFunctionAccessingField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRecreated") - public void testMultifileClassRecreated() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRecreatedAfterRenaming") - public void testMultifileClassRecreatedAfterRenaming() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRemoved") - public void testMultifileClassRemoved() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); - doTest(fileName); - } - @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); @@ -524,12 +446,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("optionalParameter") - public void testOptionalParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); - doTest(fileName); - } - @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); @@ -584,18 +500,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("packageMultifileClassOneFileWithPublicChanges") - public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); - doTest(fileName); - } - - @TestMetadata("packageMultifileClassPrivateOnlyChanged") - public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); - doTest(fileName); - } - @TestMetadata("packagePrivateOnlyChanged") public void testPackagePrivateOnlyChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); @@ -710,12 +614,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade") - public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/"); - doTest(fileName); - } - @TestMetadata("removeAndRestoreCompanion") public void testRemoveAndRestoreCompanion() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/"); @@ -806,12 +704,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("topLevelFunctionWithJvmName") - public void testTopLevelFunctionWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/"); - doTest(fileName); - } - @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); @@ -824,12 +716,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("topLevelPropertyWithJvmName") - public void testTopLevelPropertyWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/"); - doTest(fileName); - } - @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); @@ -1183,5 +1069,128 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } } + + @TestMetadata("jps-plugin/testData/incremental/withJava/other") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Other extends AbstractIncrementalJvmCompilerRunnerTest { + public void testAllFilesPresentInOther() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + + @TestMetadata("conflictingPlatformDeclarations") + public void testConflictingPlatformDeclarations() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelFunctionWithJvmName") + public void testInlineTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValPropertyWithJvmName") + public void testInlineTopLevelValPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("mainRedeclaration") + public void testMainRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/mainRedeclaration/"); + doTest(fileName); + } + + @TestMetadata("multifileClassAddTopLevelFunWithDefault") + public void testMultifileClassAddTopLevelFunWithDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileAdded") + public void testMultifileClassFileAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileChanged") + public void testMultifileClassFileChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") + public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunction") + public void testMultifileClassInlineFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunctionAccessingField") + public void testMultifileClassInlineFunctionAccessingField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreated") + public void testMultifileClassRecreated() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreatedAfterRenaming") + public void testMultifileClassRecreatedAfterRenaming() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRemoved") + public void testMultifileClassRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/"); + doTest(fileName); + } + + @TestMetadata("optionalParameter") + public void testOptionalParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/optionalParameter/"); + doTest(fileName); + } + + @TestMetadata("packageMultifileClassOneFileWithPublicChanges") + public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/"); + doTest(fileName); + } + + @TestMetadata("packageMultifileClassPrivateOnlyChanged") + public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/"); + doTest(fileName); + } + + @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade") + public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/"); + doTest(fileName); + } + + @TestMetadata("topLevelFunctionWithJvmName") + public void testTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("topLevelPropertyWithJvmName") + public void testTopLevelPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/"); + doTest(fileName); + } + } } } 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 cef611354eb..7751baa1f39 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 @@ -317,12 +317,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("conflictingPlatformDeclarations") - public void testConflictingPlatformDeclarations() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); - doTest(fileName); - } - @TestMetadata("constantRemoved") public void testConstantRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); @@ -503,24 +497,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("inlineTopLevelFunctionWithJvmName") - public void testInlineTopLevelFunctionWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/"); - doTest(fileName); - } - @TestMetadata("inlineTopLevelValProperty") public void testInlineTopLevelValProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/"); doTest(fileName); } - @TestMetadata("inlineTopLevelValPropertyWithJvmName") - public void testInlineTopLevelValPropertyWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/"); - doTest(fileName); - } - @TestMetadata("inlineTopLevelVarProperty") public void testInlineTopLevelVarProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/"); @@ -575,12 +557,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("mainRedeclaration") - public void testMainRedeclaration() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/"); - doTest(fileName); - } - @TestMetadata("moveClass") public void testMoveClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); @@ -599,60 +575,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("multifileClassAddTopLevelFunWithDefault") - public void testMultifileClassAddTopLevelFunWithDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileAdded") - public void testMultifileClassFileAdded() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileChanged") - public void testMultifileClassFileChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); - doTest(fileName); - } - - @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") - public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); - doTest(fileName); - } - - @TestMetadata("multifileClassInlineFunction") - public void testMultifileClassInlineFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); - doTest(fileName); - } - - @TestMetadata("multifileClassInlineFunctionAccessingField") - public void testMultifileClassInlineFunctionAccessingField() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRecreated") - public void testMultifileClassRecreated() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRecreatedAfterRenaming") - public void testMultifileClassRecreatedAfterRenaming() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); - doTest(fileName); - } - - @TestMetadata("multifileClassRemoved") - public void testMultifileClassRemoved() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); - doTest(fileName); - } - @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); @@ -665,12 +587,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("optionalParameter") - public void testOptionalParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); - doTest(fileName); - } - @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); @@ -725,18 +641,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("packageMultifileClassOneFileWithPublicChanges") - public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); - doTest(fileName); - } - - @TestMetadata("packageMultifileClassPrivateOnlyChanged") - public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); - doTest(fileName); - } - @TestMetadata("packagePrivateOnlyChanged") public void testPackagePrivateOnlyChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); @@ -851,12 +755,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade") - public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/"); - doTest(fileName); - } - @TestMetadata("removeAndRestoreCompanion") public void testRemoveAndRestoreCompanion() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/"); @@ -947,12 +845,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("topLevelFunctionWithJvmName") - public void testTopLevelFunctionWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/"); - doTest(fileName); - } - @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); @@ -965,12 +857,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("topLevelPropertyWithJvmName") - public void testTopLevelPropertyWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/"); - doTest(fileName); - } - @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); @@ -1231,6 +1117,129 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } } + + @TestMetadata("jps-plugin/testData/incremental/withJava/other") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Other extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInOther() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + + @TestMetadata("conflictingPlatformDeclarations") + public void testConflictingPlatformDeclarations() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelFunctionWithJvmName") + public void testInlineTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValPropertyWithJvmName") + public void testInlineTopLevelValPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("mainRedeclaration") + public void testMainRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/mainRedeclaration/"); + doTest(fileName); + } + + @TestMetadata("multifileClassAddTopLevelFunWithDefault") + public void testMultifileClassAddTopLevelFunWithDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileAdded") + public void testMultifileClassFileAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileChanged") + public void testMultifileClassFileChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") + public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunction") + public void testMultifileClassInlineFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunctionAccessingField") + public void testMultifileClassInlineFunctionAccessingField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreated") + public void testMultifileClassRecreated() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreatedAfterRenaming") + public void testMultifileClassRecreatedAfterRenaming() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRemoved") + public void testMultifileClassRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/"); + doTest(fileName); + } + + @TestMetadata("optionalParameter") + public void testOptionalParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/optionalParameter/"); + doTest(fileName); + } + + @TestMetadata("packageMultifileClassOneFileWithPublicChanges") + public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/"); + doTest(fileName); + } + + @TestMetadata("packageMultifileClassPrivateOnlyChanged") + public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/"); + doTest(fileName); + } + + @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade") + public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/"); + doTest(fileName); + } + + @TestMetadata("topLevelFunctionWithJvmName") + public void testTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("topLevelPropertyWithJvmName") + public void testTopLevelPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/"); + doTest(fileName); + } + } } @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log rename to jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt b/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt rename to jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt b/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt rename to jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new b/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new rename to jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt b/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt rename to jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt b/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt rename to jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new b/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new rename to jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt b/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/b.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt rename to jps-plugin/testData/incremental/withJava/other/mainRedeclaration/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log b/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log rename to jps-plugin/testData/incremental/withJava/other/mainRedeclaration/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new b/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new rename to jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/a.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/a.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/b.kt.new b/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/b.kt.new rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/a.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/a.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt.new b/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt.new rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/a.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/a.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt.new b/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt.new rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inline.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inline.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inlineOther.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inlineOther.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.touch b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.touch rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inline.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inline.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inlineOther.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inlineOther.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.touch b/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.touch rename to jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt.delete.1 b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1 similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt.delete.1 rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1 diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/b.kt.new.2 b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/b.kt.new.2 rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2 diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt.new.1 b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt.new.1 rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1 diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/b.kt.new.2 b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/b.kt.new.2 rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2 diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt.delete b/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt.delete rename to jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt.delete b/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt.delete rename to jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log rename to jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt b/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt rename to jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps-plugin/testData/incremental/withJava/other/optionalParameter/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log rename to jps-plugin/testData/incremental/withJava/other/optionalParameter/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt b/jps-plugin/testData/incremental/withJava/other/optionalParameter/fun.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt rename to jps-plugin/testData/incremental/withJava/other/optionalParameter/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt b/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt rename to jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.touch b/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt.touch similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.touch rename to jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt.touch diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/usage.kt b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/usage.kt rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/usage.kt b/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/usage.kt rename to jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log b/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log rename to jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt b/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt rename to jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt b/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt rename to jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new b/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new rename to jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log b/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log rename to jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt b/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt rename to jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new b/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new rename to jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt b/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt rename to jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log b/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log rename to jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt b/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt rename to jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new b/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new rename to jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt b/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt rename to jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt