From 50d2b963cc727c4a0e68956828c34f4c6fd11454 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Fri, 3 Jul 2020 21:51:34 +0300 Subject: [PATCH] Revert "202: Fix `GradleFacetImportTest#testJDKImport` test" for 193 bunch This fixes test in 193 and 192 bunch --- .../idea/codeInsight/gradle/GradleFacetImportTest.kt.193 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193 index c3028290d9a..7d8285a7981 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193 @@ -731,12 +731,10 @@ class GradleFacetImportTest : GradleImportingTestCase() { @Test fun testJDKImport() { - val mockJdkPath = "compiler/testData/mockJDK" object : WriteAction() { override fun run(result: Result) { - val jdk = JavaSdk.getInstance().createJdk("myJDK", mockJdkPath) + val jdk = JavaSdk.getInstance().createJdk("myJDK", "my/path/to/jdk") getProjectJdkTableSafe().addJdk(jdk) - ProjectRootManager.getInstance(myProject).projectSdk = jdk } }.execute() @@ -747,13 +745,12 @@ class GradleFacetImportTest : GradleImportingTestCase() { val moduleSDK = ModuleRootManager.getInstance(getModule("project_main")).sdk!! Assert.assertTrue(moduleSDK.sdkType is JavaSdk) Assert.assertEquals("myJDK", moduleSDK.name) - Assert.assertEquals(mockJdkPath, moduleSDK.homePath) + Assert.assertEquals("my/path/to/jdk", moduleSDK.homePath) } finally { object : WriteAction() { override fun run(result: Result) { val jdkTable = getProjectJdkTableSafe() jdkTable.removeJdk(jdkTable.findJdk("myJDK")!!) - ProjectRootManager.getInstance(myProject).projectSdk = null } }.execute() }