From 183559dcfa13709c67a6303a3f0909ad7436c6fb Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 17 Apr 2018 17:16:55 +0300
Subject: [PATCH] Misc: Extract AbstractConfigureKotlinInTempDirTest superclass

This avoids duplicating runs of ConfigureKotlinInTempDirTest
---
 .../AbstractConfigureKotlinInTempDirTest.kt   | 31 +++++++++++++++++++
 .../AutoConfigureKotlinSdkOnStartupTest.kt    |  2 +-
 .../ConfigureKotlinInTempDirTest.kt           | 22 +------------
 3 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt

diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt
new file mode 100644
index 00000000000..3506b641189
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-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.util.io.FileUtil
+import org.junit.Assert
+import java.io.File
+import java.io.IOException
+
+open class AbstractConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
+    @Throws(IOException::class)
+    override fun getIprFile(): File {
+        val tempDir = FileUtil.generateRandomTemporaryPath()
+        FileUtil.createTempDirectory("temp", null)
+
+        FileUtil.copyDir(File(projectRoot), tempDir)
+
+        val projectRoot = tempDir.path
+
+        val projectFilePath = projectRoot + "/projectFile.ipr"
+        if (!File(projectFilePath).exists()) {
+            val dotIdeaPath = projectRoot + "/.idea"
+            Assert.assertTrue("Project file or '.idea' dir should exists in " + projectRoot, File(dotIdeaPath).exists())
+            return File(projectRoot)
+        }
+        return File(projectFilePath)
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt
index dc84ff0d402..9bc14f16eaf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt
@@ -10,7 +10,7 @@ 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() {
+class AutoConfigureKotlinSdkOnStartupTest : AbstractConfigureKotlinInTempDirTest() {
     fun testKotlinSdkAdded() {
         Assert.assertTrue(ProjectJdkTable.getInstance().allJdks.any { it.sdkType is KotlinSdkType })
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
index 981266c9fcf..d4eb4b8ce50 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.configuration
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.impl.ApplicationImpl
-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
@@ -26,28 +25,9 @@ import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgu
 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
 
-open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
-    @Throws(IOException::class)
-    override fun getIprFile(): File {
-        val tempDir = FileUtil.generateRandomTemporaryPath()
-        FileUtil.createTempDirectory("temp", null)
-
-        FileUtil.copyDir(File(projectRoot), tempDir)
-
-        val projectRoot = tempDir.path
-
-        val projectFilePath = projectRoot + "/projectFile.ipr"
-        if (!File(projectFilePath).exists()) {
-            val dotIdeaPath = projectRoot + "/.idea"
-            Assert.assertTrue("Project file or '.idea' dir should exists in " + projectRoot, File(dotIdeaPath).exists())
-            return File(projectRoot)
-        }
-        return File(projectFilePath)
-    }
-
+open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinInTempDirTest() {
     @Throws(IOException::class)
     fun testNoKotlincExistsNoSettingsRuntime10() {
         val application = ApplicationManager.getApplication() as ApplicationImpl