From 71e74497b55173a4c0c033cee95a6bf116c7acf0 Mon Sep 17 00:00:00 2001
From: Alexander Dudinsky <Alexander.Dudinsky@jetbrains.com>
Date: Wed, 20 Jan 2021 09:46:03 +0300
Subject: [PATCH] Use `addTestJdk`&`removeTestJdk` methods instead
 `addJdk`&`removeJdk`

---
 .../idea/codeInsight/gradle/GradleFacetImportTest.kt      | 8 ++++++--
 .../idea/codeInsight/gradle/GradleImportingTestCase.kt    | 7 +++++--
 2 files changed, 11 insertions(+), 4 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 a4ac279f0f4..7e318a4ba72 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
@@ -250,7 +250,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     @Test
     fun testJsImportTransitive() {
         configureByFiles()
-        importProject()
+        importProject(false)
 
         with(facetSettings) {
             Assert.assertEquals("1.3", languageLevel!!.versionString)
@@ -867,10 +867,14 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     override fun importProject() {
+        importProject(true)
+    }
+
+    fun importProject(skipIndexing: Boolean = true) {
         val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
         try {
             currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
-            super.importProject(true)
+            super.importProject(skipIndexing)
         } finally {
             currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
         }
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
index 9de10e2d445..6cb59a93fed 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
@@ -31,6 +31,7 @@ import com.intellij.openapi.fileTypes.FileTypeManager
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.projectRoots.impl.ProjectJdkTableImpl
 import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.openapi.ui.Messages
@@ -140,7 +141,8 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
             val jdk = SdkConfigurationUtil.setupSdk(arrayOfNulls(0), jdkHomeDir, JavaSdk.getInstance(), true, null, GRADLE_JDK_NAME)
             TestCase.assertNotNull("Cannot create JDK for $myJdkHome", jdk)
             if (!jdkTable.allJdks.contains(jdk)) {
-                jdkTable.addJdk(jdk!!, testRootDisposable)
+//                jdkTable.addJdk(jdk!!, testRootDisposable)
+                (jdkTable as ProjectJdkTableImpl).addTestJdk(jdk!!, testRootDisposable)
                 ProjectRootManager.getInstance(myProject).projectSdk = jdk
             }
             FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle")
@@ -176,7 +178,8 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
             ThrowableRunnable {
                 runWrite {
                     Arrays.stream(ProjectJdkTable.getInstance().allJdks).forEach { jdk: Sdk ->
-                        ProjectJdkTable.getInstance().removeJdk(jdk)
+                        (ProjectJdkTable.getInstance() as ProjectJdkTableImpl).removeTestJdk(jdk)
+//                        ProjectJdkTable.getInstance().removeJdk(jdk)
                     }
                     for (sdk in removedSdks) {
                         SdkConfigurationUtil.addSdk(sdk)