diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 875e5549a37..1a8de7f9d49 100755 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -112,6 +112,7 @@ import org.jetbrains.kotlin.idea.refactoring.AbstractNameSuggestionProviderTest import org.jetbrains.kotlin.idea.refactoring.inline.AbstractInlineTest import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractExtractionTest import org.jetbrains.kotlin.idea.refactoring.move.AbstractMoveTest +import org.jetbrains.kotlin.idea.refactoring.move.AbstractMultiModuleMoveTest import org.jetbrains.kotlin.idea.refactoring.pullUp.AbstractPullUpTest import org.jetbrains.kotlin.idea.refactoring.pushDown.AbstractPushDownTest import org.jetbrains.kotlin.idea.refactoring.rename.AbstractMultiModuleRenameTest @@ -711,6 +712,10 @@ fun main(args: Array) { model("refactoring/move", extension = "test", singleClass = true) } + testClass { + model("refactoring/moveMultiModule", extension = "test", singleClass = true) + } + testClass { model("multiFileIntentions", extension = "test", singleClass = true, filenameStartsLowerCase = true) } diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index bdad3a6a3d9..f764fe7073b 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.test +import com.intellij.codeInsight.CodeInsightTestCase import com.intellij.codeInsight.daemon.impl.EditorTracker import com.intellij.ide.startup.impl.StartupManagerImpl import com.intellij.openapi.actionSystem.ActionPlaces @@ -71,6 +72,7 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix } }) } + CodeInsightTestCase.fixTemplates() } override fun tearDown() { diff --git a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/after/A/src/z/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/after/A/src/z/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/after/A/src/z/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/after/A/src/z/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/after/A/src/z/x/test.kt b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/after/A/src/z/x/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/after/A/src/z/x/test.kt rename to idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/after/A/src/z/x/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/before/A/src/x/test.kt b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/before/A/src/x/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/before/A/src/x/test.kt rename to idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/before/A/src/x/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/before/A/src/z/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/before/A/src/z/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/before/A/src/z/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/before/A/src/z/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test similarity index 66% rename from idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test rename to idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test index 4d78f2fae2e..2aeff1edf0c 100644 --- a/idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test +++ b/idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test @@ -2,6 +2,5 @@ "mainFile": "A/src/x/test.kt", "type": "MOVE_DIRECTORY_WITH_CLASSES", "sourceDir": "A/src/x", - "targetDir": "A/src/z", - "isMultiModule": "true" + "targetDir": "A/src/z" } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a1/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a1/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a1/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a1/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a2/internalSource.kt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a2/internalSource.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a2/internalSource.kt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a2/internalSource.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/internalTarget.kt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/internalTarget.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/internalTarget.kt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/internalTarget.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/test.kt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/test.kt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/internalTarget.kt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/internalTarget.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/internalTarget.kt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a1/internalTarget.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a2/internalSource.kt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a2/internalSource.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a2/internalSource.kt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/A/src/a2/internalSource.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/src/b/test.kt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/src/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/src/b/test.kt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/before/B/src/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test similarity index 84% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test rename to idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test index 4868ec1d937..44c36a5974c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test +++ b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test @@ -2,6 +2,5 @@ "mainFile": "A/src/a1/internalTarget.kt", "type": "MOVE_FILES_WITH_DECLARATIONS", "targetDirectory": "B/src/b", - "isMultiModule": "true", "withRuntime": "true" } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/src/packJvm/ClassUsageJs.kt b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/src/packJvm/ClassUsageJs.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/src/packJvm/ClassUsageJs.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/src/packJvm/ClassUsageJs.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/src/packJvm/testJvm.kt b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/src/packJvm/testJvm.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/src/packJvm/testJvm.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/src/packJvm/testJvm.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/B/src/packJs/testJs.kt b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/B/src/packJs/testJs.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/B/src/packJs/testJs.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/B/src/packJs/testJs.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/A/src/packJvm/testJvm.kt b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/A/src/packJvm/testJvm.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/A/src/packJvm/testJvm.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/A/src/packJvm/testJvm.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/B/src/packJs/testJs.kt b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/B/src/packJs/testJs.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/B/src/packJs/testJs.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/B/src/packJs/testJs.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/conflicts.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/conflicts.txt rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/conflicts.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test similarity index 89% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test rename to idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test index e4e2080ef4b..99d644ba520 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test +++ b/idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test @@ -3,7 +3,6 @@ "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", "targetPackage": "packJvm", "targetSourceRoot": "A/src", - "isMultiModule": "true", "withRuntime": "true", "modulesWithRuntime": ["A"], "modulesWithJsRuntime": ["B"] diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/A/src/packJvm/testJvm.kt b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/A/src/packJvm/testJvm.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/A/src/packJvm/testJvm.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/A/src/packJvm/testJvm.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/src/packJs/ClassUsageJvm.kt b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/B/src/packJs/ClassUsageJvm.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/src/packJs/ClassUsageJvm.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/B/src/packJs/ClassUsageJvm.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/src/packJs/testJs.kt b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/B/src/packJs/testJs.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/src/packJs/testJs.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/B/src/packJs/testJs.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/A/src/packJvm/testJvm.kt b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/A/src/packJvm/testJvm.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/A/src/packJvm/testJvm.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/A/src/packJvm/testJvm.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/B/src/packJs/testJs.kt b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/B/src/packJs/testJs.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/B/src/packJs/testJs.kt rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/before/B/src/packJs/testJs.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/conflicts.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/conflicts.txt rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/conflicts.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test similarity index 89% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test rename to idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test index 59673baf30c..ab3a686d9b6 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test +++ b/idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test @@ -3,7 +3,6 @@ "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", "targetPackage": "packJs", "targetSourceRoot": "B/src", - "isMultiModule": "true", "withRuntime": "true", "modulesWithRuntime": ["A"], "modulesWithJsRuntime": ["B"] diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/A/src/packA1/InternalTarget.kt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/A/src/packA1/InternalTarget.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/A/src/packA1/InternalTarget.kt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/A/src/packA1/InternalTarget.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/A/src/packA2/InternalSource.kt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/A/src/packA2/InternalSource.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/A/src/packA2/InternalSource.kt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/A/src/packA2/InternalSource.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/B/src/packB/InternalContent.kt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/B/src/packB/InternalContent.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/B/src/packB/InternalContent.kt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/B/src/packB/InternalContent.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/B/src/packB/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/B/src/packB/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/after/B/src/packB/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/after/B/src/packB/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/A/src/packA1/InternalTarget.kt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/A/src/packA1/InternalTarget.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/A/src/packA1/InternalTarget.kt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/A/src/packA1/InternalTarget.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/A/src/packA2/InternalSource.kt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/A/src/packA2/InternalSource.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/A/src/packA2/InternalSource.kt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/A/src/packA2/InternalSource.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/B/src/packB/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/B/src/packB/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/before/B/src/packB/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/before/B/src/packB/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/conflicts.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/conflicts.txt rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/conflicts.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/moveInternalToAnotherModule.test b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/moveInternalToAnotherModule.test similarity index 87% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/moveInternalToAnotherModule.test rename to idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/moveInternalToAnotherModule.test index 2fbd7cec929..b5835fb83fa 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/moveInternalToAnotherModule.test +++ b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/moveInternalToAnotherModule.test @@ -3,6 +3,5 @@ "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", "targetPackage": "packB", "targetSourceRoot": "B/src", - "isMultiModule": "true", "withRuntime": "true" } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/A/src/a/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/A/src/a/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/A/src/a/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/A/src/a/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/B/src/b/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/B/src/b/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/B/src/b/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/B/src/b/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/B/src/b/test.kt b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/B/src/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/after/B/src/b/test.kt rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/after/B/src/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/A/src/a/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/A/src/a/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/A/src/a/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/A/src/a/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/A/src/a/test.kt b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/A/src/a/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/A/src/a/test.kt rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/A/src/a/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/B/src/b/dummy.txt b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/B/src/b/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/before/B/src/b/dummy.txt rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/before/B/src/b/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/conflicts.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/conflicts.txt rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/conflicts.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test similarity index 86% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test rename to idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test index 4747872c422..e41c67f0472 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test +++ b/idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test @@ -2,7 +2,6 @@ "mainFile": "A/src/a/test.kt", "type": "MOVE_FILES_WITH_DECLARATIONS", "targetDirectory": "B/src/b", - "isMultiModule": "true", "withRuntime": "true", "modulesWithRuntime": ["A"] } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/A/src/a/test.kt b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/A/src/a/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/A/src/a/test.kt rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/A/src/a/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/B/src/b/test.kt b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/B/src/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/B/src/b/test.kt rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/B/src/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/B/src/target/val1.kt b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/B/src/target/val1.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/B/src/target/val1.kt rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/after/B/src/target/val1.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/A/src/a/test.kt b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/A/src/a/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/A/src/a/test.kt rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/A/src/a/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/B/B.iml b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/B/B.iml rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/B/src/b/test.kt b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/B/src/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/before/B/src/b/test.kt rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/before/B/src/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/conflicts.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/conflicts.txt rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/conflicts.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test similarity index 86% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test rename to idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test index 9cd06fa9270..03fd9373c4e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test +++ b/idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test @@ -3,6 +3,5 @@ "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", "targetPackage": "target", "targetSourceRoot": "B/src", - "isMultiModule": "true", "withRuntime": "true" } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/A/A.iml b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/A/A.iml rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/src/a1/dummy.txt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/A/src/a1/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/src/a1/dummy.txt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/A/src/a1/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/src/a2/internalSource.kt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/A/src/a2/internalSource.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/src/a2/internalSource.kt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/A/src/a2/internalSource.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/B.iml b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/B.iml rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/B/src/b/internalTarget.kt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/B/src/b/internalTarget.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/B/src/b/internalTarget.kt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/B/src/b/internalTarget.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/B/src/b/test.kt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/B/src/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/B/src/b/test.kt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/B/src/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/A/A.iml b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/A.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/A/A.iml rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/A.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/src/a1/dummy.txt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/src/a1/dummy.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/src/a1/dummy.txt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/src/a1/dummy.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/src/a1/internalTarget.kt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/src/a1/internalTarget.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/src/a1/internalTarget.kt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/src/a1/internalTarget.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/src/a2/internalSource.kt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/src/a2/internalSource.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/A/src/a2/internalSource.kt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/A/src/a2/internalSource.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/B/B.iml b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/B/B.iml similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/B/B.iml rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/B/B.iml diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/B/src/b/test.kt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/B/src/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/before/B/src/b/test.kt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/before/B/src/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/conflicts.txt b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/conflicts.txt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/conflicts.txt rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/conflicts.txt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/visibilityConflictInImport.test b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/visibilityConflictInImport.test similarity index 84% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/visibilityConflictInImport.test rename to idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/visibilityConflictInImport.test index 4868ec1d937..44c36a5974c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/visibilityConflictInImport.test +++ b/idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/visibilityConflictInImport.test @@ -2,6 +2,5 @@ "mainFile": "A/src/a1/internalTarget.kt", "type": "MOVE_FILES_WITH_DECLARATIONS", "targetDirectory": "B/src/b", - "isMultiModule": "true", "withRuntime": "true" } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt index 21051cda2b8..d542b311b11 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.idea.refactoring.move import com.google.gson.JsonObject import com.google.gson.JsonParser -import com.intellij.codeInsight.TargetElementUtilBase +import com.intellij.codeInsight.TargetElementUtil import com.intellij.openapi.editor.EditorFactory import com.intellij.openapi.fileEditor.FileDocumentManager -import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleManager +import com.intellij.openapi.project.Project import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.* @@ -36,20 +36,21 @@ import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectori import com.intellij.refactoring.move.moveInner.MoveInnerProcessor import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor +import com.intellij.testFramework.LightProjectDescriptor +import com.intellij.testFramework.PlatformTestUtil +import com.intellij.testFramework.UsefulTestCase import com.intellij.util.ActionRunner import org.jetbrains.kotlin.idea.jsonUtils.getNullableString import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.refactoring.createKotlinFile import org.jetbrains.kotlin.idea.refactoring.move.changePackage.KotlinChangePackageRefactoring import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.* +import org.jetbrains.kotlin.idea.refactoring.rename.loadTestConfiguration import org.jetbrains.kotlin.idea.refactoring.toPsiDirectory import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex -import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase -import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -import org.jetbrains.kotlin.idea.test.extractMarkerOffset +import org.jetbrains.kotlin.idea.test.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile @@ -58,98 +59,94 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -abstract class AbstractMoveTest : KotlinMultiFileTestCase() { +abstract class AbstractMoveTest : KotlinLightCodeInsightFixtureTestCase() { + override fun getProjectDescriptor(): LightProjectDescriptor { + if (KotlinTestUtils.isAllFilesPresentTest(getTestName(false))) return super.getProjectDescriptor() + + val testConfigurationFile = File(super.getTestDataPath(), fileName()) + val config = loadTestConfiguration(testConfigurationFile) + val withRuntime = config["withRuntime"]?.asBoolean ?: false + if (withRuntime) { + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + } + return KotlinLightProjectDescriptor.INSTANCE + } + protected fun doTest(path: String) { - val config = JsonParser().parse(FileUtil.loadFile(File(path), true)) as JsonObject + val testFile = File(path) + val config = JsonParser().parse(FileUtil.loadFile(testFile, true)) as JsonObject - val action = MoveAction.valueOf(config.getString("type")) - - val testDir = path.substring(0, path.lastIndexOf("/")) - val mainFilePath = config.getNullableString("mainFile")!! - - val conflictFile = File(testDir + "/conflicts.txt") - - isMultiModule = config["isMultiModule"]?.asBoolean ?: false - - doTest({ rootDir, _ -> - val modulesWithJvmRuntime: List - val modulesWithJsRuntime: List - - val withRuntime = config["withRuntime"]?.asBoolean ?: false - if (withRuntime) { - val moduleManager = ModuleManager.getInstance(project) - modulesWithJvmRuntime = - (config["modulesWithRuntime"]?.asJsonArray?.map { moduleManager.findModuleByName(it.asString!!)!! } - ?: moduleManager.modules.toList()) - modulesWithJvmRuntime.forEach { ConfigLibraryUtil.configureKotlinRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) } - modulesWithJsRuntime = - (config["modulesWithJsRuntime"]?.asJsonArray?.map { moduleManager.findModuleByName(it.asString!!)!! } - ?: emptyList()) - modulesWithJsRuntime.forEach { ConfigLibraryUtil.configureKotlinJsRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) } - } - else { - modulesWithJvmRuntime = emptyList() - modulesWithJsRuntime = emptyList() - } - - val mainFile = rootDir.findFileByRelativePath(mainFilePath)!! - val mainPsiFile = PsiManager.getInstance(project!!).findFile(mainFile)!! - val document = FileDocumentManager.getInstance().getDocument(mainFile)!! - val editor = EditorFactory.getInstance()!!.createEditor(document, project!!)!! - - val caretOffset = document.extractMarkerOffset(project) - val elementAtCaret = if (caretOffset >= 0) { - TargetElementUtilBase.getInstance()!!.findTargetElement( - editor, - TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED, - caretOffset - ) - } - else null - - try { - action.runRefactoring(rootDir, mainPsiFile, elementAtCaret, config) - - assert(!conflictFile.exists()) - } - catch(e: ConflictsInTestsException) { - KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.sorted().joinToString("\n")) - - ConflictsInTestsException.setTestIgnore(true) - - // Run refactoring again with ConflictsInTestsException suppressed - action.runRefactoring(rootDir, mainPsiFile, elementAtCaret, config) - } - finally { - ConflictsInTestsException.setTestIgnore(false) - - PsiDocumentManager.getInstance(project!!).commitAllDocuments() - FileDocumentManager.getInstance().saveAllDocuments() - - EditorFactory.getInstance()!!.releaseEditor(editor) - - modulesWithJvmRuntime.forEach { - ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) - } - modulesWithJsRuntime.forEach { - ConfigLibraryUtil.unConfigureKotlinJsRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) - } - } - }, - getTestDirName(true)) + doTestCommittingDocuments(testFile) { rootDir -> + runMoveRefactoring(path, config, rootDir, project) + } } protected fun getTestDirName(lowercaseFirstLetter : Boolean) : String { val testName = getTestName(lowercaseFirstLetter) - return testName.substring(0, testName.lastIndexOf('_')).replace('_', '/') + val endIndex = testName.lastIndexOf('_') + if (endIndex < 0) return testName + return testName.substring(0, endIndex).replace('_', '/') } - override fun getTestRoot() : String { - return "/refactoring/move/" - } + override fun getTestDataPath() = super.getTestDataPath() + "/" + getTestDirName(true) - override fun getTestDataPath() : String { - return PluginTestCaseBase.getTestDataPathBase() + protected fun doTestCommittingDocuments(testFile: File, action: (VirtualFile) -> Unit) { + val beforeVFile = myFixture.copyDirectoryToProject("before", "") + PsiDocumentManager.getInstance(myFixture.project).commitAllDocuments() + + val afterDir = File(testFile.parentFile, "after") + val afterVFile = LocalFileSystem.getInstance().findFileByIoFile(afterDir)?.apply { + UsefulTestCase.refreshRecursively(this) + } + + action(beforeVFile) + + PsiDocumentManager.getInstance(project).commitAllDocuments() + FileDocumentManager.getInstance().saveAllDocuments() + PlatformTestUtil.assertDirectoriesEqual(afterVFile, beforeVFile) + } +} + +fun runMoveRefactoring(path: String, config: JsonObject, rootDir: VirtualFile, project: Project) { + val action = MoveAction.valueOf(config.getString("type")) + + val testDir = path.substring(0, path.lastIndexOf("/")) + val mainFilePath = config.getNullableString("mainFile")!! + + val conflictFile = File(testDir + "/conflicts.txt") + + val mainFile = rootDir.findFileByRelativePath(mainFilePath)!! + val mainPsiFile = PsiManager.getInstance(project).findFile(mainFile)!! + val document = FileDocumentManager.getInstance().getDocument(mainFile)!! + val editor = EditorFactory.getInstance()!!.createEditor(document, project)!! + + val caretOffset = document.extractMarkerOffset(project) + val elementAtCaret = if (caretOffset >= 0) { + TargetElementUtil.getInstance().findTargetElement( + editor, + TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtil.ELEMENT_NAME_ACCEPTED, + caretOffset + ) + } + else null + + try { + action.runRefactoring(rootDir, mainPsiFile, elementAtCaret, config) + + assert(!conflictFile.exists()) + } + catch(e: ConflictsInTestsException) { + KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.sorted().joinToString("\n")) + + ConflictsInTestsException.setTestIgnore(true) + + // Run refactoring again with ConflictsInTestsException suppressed + action.runRefactoring(rootDir, mainPsiFile, elementAtCaret, config) + } + finally { + ConflictsInTestsException.setTestIgnore(false) + + EditorFactory.getInstance()!!.releaseEditor(editor) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMultiModuleMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMultiModuleMoveTest.kt new file mode 100644 index 00000000000..b7c70db05f2 --- /dev/null +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMultiModuleMoveTest.kt @@ -0,0 +1,88 @@ +/* + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.idea.refactoring.move + +import com.intellij.openapi.fileEditor.FileDocumentManager +import com.intellij.openapi.module.Module +import com.intellij.openapi.module.ModuleManager +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.psi.PsiDocumentManager +import org.jetbrains.kotlin.idea.refactoring.rename.loadTestConfiguration +import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil +import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import java.io.File + +abstract class AbstractMultiModuleMoveTest : KotlinMultiFileTestCase() { + override fun getTestRoot(): String = "/refactoring/moveMultiModule/" + + override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + + fun doTest(path: String) { + val config = loadTestConfiguration(File(path)) + + isMultiModule = true + + doTestCommittingDocuments { rootDir, _ -> + val modulesWithJvmRuntime: List + val modulesWithJsRuntime: List + + val withRuntime = config["withRuntime"]?.asBoolean ?: false + if (withRuntime) { + val moduleManager = ModuleManager.getInstance(project) + modulesWithJvmRuntime = + (config["modulesWithRuntime"]?.asJsonArray?.map { moduleManager.findModuleByName(it.asString!!)!! } + ?: moduleManager.modules.toList()) + modulesWithJvmRuntime.forEach { ConfigLibraryUtil.configureKotlinRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) } + modulesWithJsRuntime = + (config["modulesWithJsRuntime"]?.asJsonArray?.map { moduleManager.findModuleByName(it.asString!!)!! } + ?: emptyList()) + modulesWithJsRuntime.forEach { ConfigLibraryUtil.configureKotlinJsRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) } + } + else { + modulesWithJvmRuntime = emptyList() + modulesWithJsRuntime = emptyList() + } + + try { + runMoveRefactoring(path, config, rootDir, project) + } + finally { + modulesWithJvmRuntime.forEach { + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) + } + modulesWithJsRuntime.forEach { + ConfigLibraryUtil.unConfigureKotlinJsRuntimeAndSdk(it, PluginTestCaseBase.mockJdk()) + } + } + } + } + + protected fun doTestCommittingDocuments(action : (VirtualFile, VirtualFile?) -> Unit) { + super.doTest({ rootDir, rootAfter -> + action(rootDir, rootAfter) + + PsiDocumentManager.getInstance(project!!).commitAllDocuments() + FileDocumentManager.getInstance().saveAllDocuments() + }, getTestDirName(true)) + } + + protected fun getTestDirName(lowercaseFirstLetter : Boolean) : String { + val testName = getTestName(lowercaseFirstLetter) + return testName.substring(0, testName.indexOf('_')) + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java index bf10538effe..2f2ae1d599b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java @@ -228,12 +228,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveDirectory/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test") - public void testKotlin_moveDirectory_moveDirectoryKeepPackageDirective_MoveDirectoryKeepPackageDirective() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveDirectory/moveDirectoryWithPackageDirectiveChange/moveDirectoryWithPackageDirectiveChange.test") public void testKotlin_moveDirectory_moveDirectoryWithPackageDirectiveChange_MoveDirectoryWithPackageDirectiveChange() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryWithPackageDirectiveChange/moveDirectoryWithPackageDirectiveChange.test"); @@ -522,12 +516,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test") - public void testKotlin_moveTopLevelDeclarations_misc_moveFileWithDeclarationsToUnrelatedModuleConflict_MoveFileWithDeclarationsToUnrelatedModuleConflict() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveFromDefaultPackage/moveFromDefaultPackage.test") public void testKotlin_moveTopLevelDeclarations_misc_moveFromDefaultPackage_MoveFromDefaultPackage() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFromDefaultPackage/moveFromDefaultPackage.test"); @@ -540,24 +528,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/moveInternalToAnotherModule.test") - public void testKotlin_moveTopLevelDeclarations_misc_moveInternalToAnotherModule_MoveInternalToAnotherModule() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveInternalToAnotherModule/moveInternalToAnotherModule.test"); - doTest(fileName); - } - - @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test") - public void testKotlin_moveTopLevelDeclarations_misc_moveToModuleWithoutLibConflict_MoveToModuleWithoutLibConflict() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test"); - doTest(fileName); - } - - @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test") - public void testKotlin_moveTopLevelDeclarations_misc_moveToUnrelatedModuleConflict_MoveToUnrelatedModuleConflict() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveTopLevelDeclarations/misc/selfReferences/selfReferences.test") public void testKotlin_moveTopLevelDeclarations_misc_selfReferences_SelfReferences() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/selfReferences.test"); @@ -594,12 +564,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/visibilityConflictInImport.test") - public void testKotlin_moveTopLevelDeclarations_misc_visibilityConflictInImport_VisibilityConflictInImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/visibilityConflictInImport.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test") public void testKotlin_moveTopLevelDeclarations_moveClassToFile_MoveClassToFile() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test"); @@ -636,18 +600,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test") - public void testKotlin_moveTopLevelDeclarations_moveFromJsModuleToJvmModule_MoveFromJsModuleToJvmModule() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test"); - doTest(fileName); - } - - @TestMetadata("kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test") - public void testKotlin_moveTopLevelDeclarations_moveFromJvmModuleToJsModule_MoveFromJvmModuleToJsModule() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToFile_MoveFunctionToFile() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MultiModuleMoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MultiModuleMoveTestGenerated.java new file mode 100644 index 00000000000..eaecc30e9ed --- /dev/null +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MultiModuleMoveTestGenerated.java @@ -0,0 +1,86 @@ +/* + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.idea.refactoring.move; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("idea/testData/refactoring/moveMultiModule") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class MultiModuleMoveTestGenerated extends AbstractMultiModuleMoveTest { + public void testAllFilesPresentInMoveMultiModule() throws Exception { + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/moveMultiModule"), Pattern.compile("^(.+)\\.test$"), TargetBackend.ANY); + } + + @TestMetadata("moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test") + public void testMoveDirectoryKeepPackageDirective_MoveDirectoryKeepPackageDirective() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/moveDirectoryKeepPackageDirective/moveDirectoryKeepPackageDirective.test"); + doTest(fileName); + } + + @TestMetadata("moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test") + public void testMoveFileWithDeclarationsToUnrelatedModuleConflict_MoveFileWithDeclarationsToUnrelatedModuleConflict() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/moveFileWithDeclarationsToUnrelatedModuleConflict.test"); + doTest(fileName); + } + + @TestMetadata("moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test") + public void testMoveFromJsModuleToJvmModule_MoveFromJsModuleToJvmModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test"); + doTest(fileName); + } + + @TestMetadata("moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test") + public void testMoveFromJvmModuleToJsModule_MoveFromJvmModuleToJsModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test"); + doTest(fileName); + } + + @TestMetadata("moveInternalToAnotherModule/moveInternalToAnotherModule.test") + public void testMoveInternalToAnotherModule_MoveInternalToAnotherModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/moveInternalToAnotherModule.test"); + doTest(fileName); + } + + @TestMetadata("moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test") + public void testMoveToModuleWithoutLibConflict_MoveToModuleWithoutLibConflict() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/moveToModuleWithoutLibConflict/moveToModuleWithoutLibConflict.test"); + doTest(fileName); + } + + @TestMetadata("moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test") + public void testMoveToUnrelatedModuleConflict_MoveToUnrelatedModuleConflict() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/moveToUnrelatedModuleConflict.test"); + doTest(fileName); + } + + @TestMetadata("visibilityConflictInImport/visibilityConflictInImport.test") + public void testVisibilityConflictInImport_VisibilityConflictInImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/visibilityConflictInImport.test"); + doTest(fileName); + } +}