From d3c54f664b888c98e8d51205af5bf9052b313c31 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 27 Mar 2020 13:58:24 +0300
Subject: [PATCH] Wizard: fix 191 tests

---
 idea/idea-new-project-wizard/build.gradle.kts     | 15 +++++++++++++++
 .../wizard/AbstractNewWizardProjectImportTest.kt  | 14 ++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/idea/idea-new-project-wizard/build.gradle.kts b/idea/idea-new-project-wizard/build.gradle.kts
index 9c89115ecba..0bb8f8aa102 100644
--- a/idea/idea-new-project-wizard/build.gradle.kts
+++ b/idea/idea-new-project-wizard/build.gradle.kts
@@ -24,6 +24,21 @@ dependencies {
     testImplementation(intellijPluginDep("gradle"))
 
 
+
+    testRuntimeOnly(toolsJar())
+    testRuntimeOnly(project(":plugins:kapt3-idea"))
+    testRuntimeOnly(project(":allopen-ide-plugin"))
+    testRuntimeOnly(project(":sam-with-receiver-ide-plugin"))
+    testRuntimeOnly(project(":noarg-ide-plugin"))
+    testRuntimeOnly(project(":kotlinx-serialization-ide-plugin"))
+    testRuntimeOnly(project(":kotlin-reflect"))
+    testRuntimeOnly(project(":plugins:annotation-based-compiler-plugins-ide-support"))
+    testRuntimeOnly(project(":kotlin-gradle-statistics"))
+    testRuntimeOnly(project(":kotlin-scripting-idea"))
+    testRuntimeOnly(intellijRuntimeAnnotations())
+
+
+
     excludeInAndroidStudio(rootProject) {
         compileOnly(intellijPluginDep("maven"))
     }
diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt
index a1517551779..d2fdcf953a2 100644
--- a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt
+++ b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt
@@ -11,6 +11,7 @@ import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.projectRoots.SimpleJavaSdkType
 import com.intellij.testFramework.IdeaTestUtil
 import com.intellij.testFramework.PlatformTestCase
+import org.jetbrains.kotlin.idea.test.KotlinSdkCreationChecker
 import org.jetbrains.kotlin.test.testFramework.runWriteAction
 import org.jetbrains.kotlin.tools.projectWizard.cli.*
 import org.jetbrains.kotlin.tools.projectWizard.core.service.Services
@@ -32,15 +33,20 @@ import java.nio.file.Paths
 //TODO change to HeavyPlatformTestCase when we stop supporting <= 192
 abstract class AbstractNewWizardProjectImportTest : PlatformTestCase() {
     abstract fun createWizard(directory: Path, buildSystem: BuildSystem, projectDirectory: Path): Wizard
+
+    lateinit var sdkCreationChecker: KotlinSdkCreationChecker
+
     override fun setUp() {
         super.setUp()
         runWriteAction {
             val sdk = SimpleJavaSdkType().createJdk(SDK_NAME, IdeaTestUtil.requireRealJdkHome())
             ProjectJdkTable.getInstance().addJdk(sdk, project)
         }
+        sdkCreationChecker = KotlinSdkCreationChecker()
     }
 
     override fun tearDown() {
+        sdkCreationChecker.removeNewKotlinSdk()
         super.tearDown()
         runWriteAction {
             ProjectJdkTable.getInstance().findJdk(SDK_NAME)?.let(ProjectJdkTable.getInstance()::removeJdk)
@@ -85,8 +91,8 @@ abstract class AbstractNewWizardProjectImportTest : PlatformTestCase() {
             serviceDirectoryPath = GradleEnvironment.Headless.GRADLE_SERVICE_DIRECTORY ?: serviceDirectoryPath
         }
 
-        // not needed on <= 192 (and causes error on <= 192 ):
-        if (!is192orLess()) {
+        // not needed on 192 (and causes error on 192 ):
+        if (!is192()) {
             val settings = GradleProjectSettings().apply {
                 externalProjectPath = directory.toString()
                 isUseAutoImport = false
@@ -98,8 +104,8 @@ abstract class AbstractNewWizardProjectImportTest : PlatformTestCase() {
         }
     }
 
-    private fun is192orLess() =
-        ApplicationInfoImpl.getShadowInstance().minorVersionMainPart.toIntOrNull()?.let { it <= 2 } == true
+    private fun is192() =
+        ApplicationInfoImpl.getShadowInstance().minorVersionMainPart == "2"
                 && ApplicationInfoImpl.getShadowInstance().majorVersion == "2019"
 
     companion object {