From 0d2e790b32de52644f5082371438a707b6f45a9f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 30 Oct 2019 12:10:34 +0300 Subject: [PATCH] Fix IdeaModuleInfoTest.testSdkForScript in 193 There's automatic jdk 7 registration starting from 193. --- .../kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt index b23326d21ef..d4718c1ded3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt @@ -39,7 +39,6 @@ import org.junit.runner.RunWith @RunWith(JUnit3WithIdeaConfigurationRunner::class) class IdeaModuleInfoTest : ModuleTestCase() { - fun testSimpleModuleDependency() { val (a, b) = modules() b.addDependency(a) @@ -346,13 +345,18 @@ class IdeaModuleInfoTest : ModuleTestCase() { } fun testSdkForScript() { + // The first known jdk will be used for scripting if there is no jdk in the project runWriteAction { ProjectJdkTable.getInstance().addJdk(mockJdk6()) ProjectJdkTable.getInstance().addJdk(mockJdk9()) + + ProjectRootManager.getInstance(project).projectSdk = null } + val firstSDK = ProjectJdkTable.getInstance().allJdks.first() + with(createFileInProject("script.kts").moduleInfo) { - dependencies().filterIsInstance().single { it.sdk == mockJdk6() } + dependencies().filterIsInstance().single { it.sdk == firstSDK } } }