diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.181 b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.181 new file mode 100644 index 00000000000..e0527886939 --- /dev/null +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.181 @@ -0,0 +1,32 @@ +/* + * 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.nio.file.Path + +open class AbstractConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() { + override fun getProjectDirOrFile(): Path { + val tempDir = FileUtil.generateRandomTemporaryPath() + FileUtil.createTempDirectory("temp", null) + myFilesToDelete.add(tempDir) + + 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).toPath() + } + + return File(projectFilePath).toPath() + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.as32 b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.as32 new file mode 100644 index 00000000000..3506b641189 --- /dev/null +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt.as32 @@ -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/ConfigureKotlinInTempDirTest.kt.181 b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt.181 index 28768a2e1c1..86c067e7fbb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt.181 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt.181 @@ -30,26 +30,7 @@ import java.io.File import java.io.IOException import java.nio.file.Path -open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() { - override fun getProjectDirOrFile(): Path { - val tempDir = FileUtil.generateRandomTemporaryPath() - FileUtil.createTempDirectory("temp", null) - myFilesToDelete.add(tempDir) - - 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).toPath() - } - - return File(projectFilePath).toPath() - } - +open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinInTempDirTest() { @Throws(IOException::class) fun testNoKotlincExistsNoSettingsRuntime10() { val application = ApplicationManager.getApplication() as ApplicationImpl diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt.as32 b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt.as32 index 981266c9fcf..d4eb4b8ce50 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt.as32 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt.as32 @@ -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