azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc: Extract AbstractConfigureKotlinInTempDirTest superclass

Browse Source 
This avoids duplicating runs of ConfigureKotlinInTempDirTest
This commit is contained in:
Alexey Sedunov
2018-04-17 17:16:55 +03:00
parent 33a312c26d
commit 183559dcfa
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinInTempDirTest.kt
+31
View File
@@ -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)
}
}
idea/tests/org/jetbrains/kotlin/idea/configuration/AutoConfigureKotlinSdkOnStartupTest.kt
+1 -1
View File
@@ -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 })
}
idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
+1 -21
View File
@@ -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