diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt index f398240426f..debbbc86483 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt @@ -12,6 +12,7 @@ import com.intellij.openapi.projectRoots.JavaSdk import com.intellij.openapi.roots.CompilerModuleExtension import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.ModuleRootManager +import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.roots.impl.libraries.LibraryEx import com.intellij.util.PathUtil import junit.framework.TestCase @@ -2526,10 +2527,12 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { } fun testJDKImport() { + val mockJdkPath = "compiler/testData/mockJDK" object : WriteAction() { override fun run(result: Result) { - val jdk = JavaSdk.getInstance().createJdk("myJDK", "my/path/to/jdk") + val jdk = JavaSdk.getInstance().createJdk("myJDK", mockJdkPath) getProjectJdkTableSafe().addJdk(jdk) + ProjectRootManager.getInstance(myProject).projectSdk = jdk } }.execute() @@ -2568,7 +2571,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { - my/path/to/jdk + ${mockJdkPath} @@ -2582,12 +2585,13 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { val moduleSDK = ModuleRootManager.getInstance(getModule("project")).sdk!! Assert.assertTrue(moduleSDK.sdkType is JavaSdk) Assert.assertEquals("myJDK", moduleSDK.name) - Assert.assertEquals("my/path/to/jdk", moduleSDK.homePath) + Assert.assertEquals(mockJdkPath, moduleSDK.homePath) } finally { object : WriteAction() { override fun run(result: Result) { val jdkTable = getProjectJdkTableSafe() jdkTable.removeJdk(jdkTable.findJdk("myJDK")!!) + ProjectRootManager.getInstance(myProject).projectSdk = null } }.execute() }