diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java index 0b52de14970..ac76a28222d 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java @@ -48,30 +48,34 @@ public class ConfigLibraryUtil { return editor; } - public static void configureKotlinRuntime(Module module, Sdk sdk) { - configureLibrary(module, sdk, getKotlinRuntimeLibEditor(DEFAULT_JAVA_RUNTIME_LIB_NAME, PathUtil.getKotlinPathsForDistDirectory().getRuntimePath())); - } - - public static void configureKotlinJsRuntime(Module module, Sdk sdk) { - configureLibrary(module, sdk, getKotlinRuntimeLibEditor(DEFAULT_KOTLIN_JS_STDLIB_NAME, PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath())); - } - - public static void unConfigureKotlinRuntime(Module module, Sdk sdk) { - unConfigureLibrary(module, sdk, DEFAULT_JAVA_RUNTIME_LIB_NAME); - } - - public static void unConfigureKotlinJsRuntime(Module module, Sdk sdk) { - unConfigureLibrary(module, sdk, DEFAULT_KOTLIN_JS_STDLIB_NAME); - } - - public static void configureLibrary(Module module, Sdk sdk, NewLibraryEditor libraryEditor) { + public static void configureKotlinRuntimeAndSdk(Module module, Sdk sdk) { configureSdk(module, sdk); - addLibrary(libraryEditor, module); + configureKotlinRuntime(module); } - public static void unConfigureLibrary(Module module, Sdk sdk, String libraryName) { + public static void configureKotlinJsRuntimeAndSdk(Module module, Sdk sdk) { configureSdk(module, sdk); - removeLibrary(module, libraryName); + configureKotlinJsRuntime(module); + } + + public static void configureKotlinRuntime(Module module) { + addLibrary(getKotlinRuntimeLibEditor(DEFAULT_JAVA_RUNTIME_LIB_NAME, PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), + module); + } + + public static void configureKotlinJsRuntime(Module module) { + addLibrary(getKotlinRuntimeLibEditor(DEFAULT_KOTLIN_JS_STDLIB_NAME, + PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()), module); + } + + public static void unConfigureKotlinRuntimeAndSdk(Module module, Sdk sdk) { + configureSdk(module, sdk); + removeLibrary(module, DEFAULT_JAVA_RUNTIME_LIB_NAME); + } + + public static void unConfigureKotlinJsRuntimeAndSdk(Module module, Sdk sdk) { + configureSdk(module, sdk); + removeLibrary(module, DEFAULT_KOTLIN_JS_STDLIB_NAME); } public static void configureSdk(@NotNull final Module module, @NotNull final Sdk sdk) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt index f0c1db7e9ea..03a7cdf1033 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt @@ -68,7 +68,7 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase try { if (isWithRuntime) { - ConfigLibraryUtil.configureKotlinRuntime( + ConfigLibraryUtil.configureKotlinRuntimeAndSdk( myFixture.getModule(), if (fullJdk) PluginTestCaseBase.fullJdk() else PluginTestCaseBase.mockJdk() ) @@ -85,7 +85,7 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase } finally { if (isWithRuntime) { - ConfigLibraryUtil.unConfigureKotlinRuntime(myFixture.getModule(), IdeaTestUtil.getMockJdk17()) + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(myFixture.getModule(), IdeaTestUtil.getMockJdk17()) } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index 9bd0896f602..1c3d764395a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -117,7 +117,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase { try { if (isWithRuntime) { - ConfigLibraryUtil.configureKotlinRuntime(getModule(), PluginTestCaseBase.mockJdk()); + ConfigLibraryUtil.configureKotlinRuntimeAndSdk(getModule(), PluginTestCaseBase.mockJdk()); } DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) getFile()); @@ -126,7 +126,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase { } finally { if (isWithRuntime) { - ConfigLibraryUtil.unConfigureKotlinRuntime(getModule(), getTestProjectJdk()); + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(getModule(), getTestProjectJdk()); } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index 8a721f6954a..5e7e5b27181 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -74,7 +74,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer boolean withRuntime = InTextDirectivesUtils.isDirectiveDefined(originalFileText, "// WITH_RUNTIME"); if (withRuntime) { - ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk()); + ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()); } try { @@ -142,7 +142,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer } finally { if (withRuntime) { - ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk()); + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()); } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java index 328d1035dfc..86f049e339b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java @@ -83,19 +83,19 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase { private static void configureRuntimeIfNeeded(@NotNull String beforeFileName) { if (beforeFileName.endsWith("JsRuntime.kt")) { - ConfigLibraryUtil.configureKotlinJsRuntime(getModule(), getFullJavaJDK()); + ConfigLibraryUtil.configureKotlinJsRuntimeAndSdk(getModule(), getFullJavaJDK()); } else if (beforeFileName.endsWith("Runtime.kt")) { - ConfigLibraryUtil.configureKotlinRuntime(getModule(), getFullJavaJDK()); + ConfigLibraryUtil.configureKotlinRuntimeAndSdk(getModule(), getFullJavaJDK()); } } - private void unConfigureRuntimeIfNeeded(@NotNull String beforeFileName) { + private static void unConfigureRuntimeIfNeeded(@NotNull String beforeFileName) { if (beforeFileName.endsWith("JsRuntime.kt")) { - ConfigLibraryUtil.unConfigureKotlinJsRuntime(getModule(), getProjectJDK()); + ConfigLibraryUtil.unConfigureKotlinJsRuntimeAndSdk(getModule(), getProjectJDK()); } else if (beforeFileName.endsWith("Runtime.kt")) { - ConfigLibraryUtil.unConfigureKotlinRuntime(getModule(), getProjectJDK()); + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(getModule(), getProjectJDK()); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt index 716b19d4c70..c9b0aeece4e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt @@ -225,7 +225,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null if (addKotlinRuntime) { - ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk()) + ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) } try { @@ -240,7 +240,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe } finally { if (addKotlinRuntime) { - ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk()) + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt index db1f13cbc54..2861c7ff8f7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt @@ -80,7 +80,7 @@ public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() { val withRuntime = config["withRuntime"]?.getAsBoolean() ?: false if (withRuntime) { - ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk()) + ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) } doTest({ rootDir, rootAfter -> @@ -114,7 +114,7 @@ public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() { EditorFactory.getInstance()!!.releaseEditor(editor) if (withRuntime) { - ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.mockJdk()) + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) } } }, diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt index 18b25d08c5f..a56fa702f2c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt @@ -41,8 +41,8 @@ import com.intellij.testFramework.PsiTestUtil import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil.configureKotlinJsRuntime -import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil.configureKotlinRuntime +import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil.configureKotlinJsRuntimeAndSdk +import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil.configureKotlinRuntimeAndSdk import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.JetNamedDeclaration @@ -91,11 +91,11 @@ class RunConfigurationTest: CodeInsightTestCase() { } fun testClassesAndObjects() { - doTest(ConfigLibraryUtil::configureKotlinRuntime) + doTest(ConfigLibraryUtil::configureKotlinRuntimeAndSdk) } fun testInJsModule() { - doTest(ConfigLibraryUtil::configureKotlinJsRuntime) + doTest(ConfigLibraryUtil::configureKotlinJsRuntimeAndSdk) } private fun doTest(configureRuntime: (Module, Sdk) -> Unit) { @@ -133,7 +133,7 @@ class RunConfigurationTest: CodeInsightTestCase() { Assert.assertEquals(expectedClasses, actualClasses) } finally { - ConfigLibraryUtil.unConfigureKotlinRuntime(createModuleResult.module, PluginTestCaseBase.mockJdk()) + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(createModuleResult.module, PluginTestCaseBase.mockJdk()) } }