From ba71e732a9e45244bef3df2a72360637cb7f3a2e Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 20 Feb 2018 15:28:34 +0300
Subject: [PATCH] Misc: Extract "KotlinSdkAdded" test to separate test case

This is needed due to application being initialized only once per test case,
while Kotlin SDK is configured during PluginStartupComponent initialization
---
 .../AutoConfigureKotlinSdkOnStartupTest.kt      | 17 +++++++++++++++++
 .../ConfigureKotlinInTempDirTest.kt             |  8 +-------
 2 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt

diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt
new file mode 100644
index 00000000000..dc84ff0d402
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.configuration
+
+import com.intellij.openapi.projectRoots.ProjectJdkTable
+import org.jetbrains.kotlin.idea.framework.KotlinSdkType
+import org.junit.Assert
+
+// Do not add new tests here since application is initialized only once
+class AutoConfigureKotlinSdkOnStartupTest : ConfigureKotlinInTempDirTest() {
+    fun testKotlinSdkAdded() {
+        Assert.assertTrue(ProjectJdkTable.getInstance().allJdks.any { it.sdkType is KotlinSdkType })
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
index 2789518d792..701238b5c6e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
@@ -18,20 +18,18 @@ package org.jetbrains.kotlin.idea.configuration
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.impl.ApplicationImpl
-import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.util.io.FileUtil
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder
-import org.jetbrains.kotlin.idea.framework.KotlinSdkType
 import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.junit.Assert
 import java.io.File
 import java.io.IOException
 
-class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
+open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
     @Throws(IOException::class)
     override fun getIprFile(): File {
         val tempDir = FileUtil.generateRandomTemporaryPath()
@@ -130,8 +128,4 @@ class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
         val settings = myProject.getLanguageVersionSettings()
         Assert.assertEquals(ApiVersion.KOTLIN_1_1, settings.apiVersion)
     }
-
-    fun testKotlinSdkAdded() {
-        Assert.assertTrue(ProjectJdkTable.getInstance().allJdks.any { it.sdkType is KotlinSdkType })
-    }
 }