From 5c95c48c90aadcb61f82ad90695fd77517f0e7e2 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Wed, 17 Jun 2020 19:34:32 +0300 Subject: [PATCH] 202: Fix `GradleFacetImportTest#testJDKImport` test Test failure was caused by 8e1ab882641db695e3b70085d14a59e1e8e9f579 + b79ca6e3a855b9d74dba129583d7ed25ecd2f552 in intellij --- .../idea/codeInsight/gradle/GradleFacetImportTest.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt index d7fb7a905f4..c3028290d9a 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt @@ -23,6 +23,7 @@ import com.intellij.openapi.projectRoots.JavaSdk import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.OrderRootType +import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.roots.impl.libraries.LibraryEx import junit.framework.TestCase import org.jetbrains.jps.model.java.JavaResourceRootType @@ -730,10 +731,12 @@ class GradleFacetImportTest : GradleImportingTestCase() { @Test 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() @@ -744,12 +747,13 @@ class GradleFacetImportTest : GradleImportingTestCase() { val moduleSDK = ModuleRootManager.getInstance(getModule("project_main")).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() }