Minor: move some properties of AbstractIncrementalJpsTest to constructor

This commit is contained in:
Zalim Bashorov
2015-08-04 15:03:38 +03:00
parent 5017153c72
commit 36f69d9fd6
3 changed files with 6 additions and 16 deletions
@@ -56,7 +56,10 @@ import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.fail
public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
public abstract class AbstractIncrementalJpsTest(
private val allowNoFilesWithSuffixInTestData: Boolean = false,
private val checkDumpsCaseInsensitively: Boolean = false
) : JpsBuildTestCase() {
companion object {
val COMPILATION_FAILED = "COMPILATION FAILED"
@@ -96,15 +99,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
super.tearDown()
}
protected open val allowNoFilesWithSuffixInTestData: Boolean
get() = false
protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver?
get() = null
protected open val checkDumpsCaseInsensitively: Boolean
get() = false
fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult {
val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath())
val logger = MyLogger(workDirPath)
@@ -19,11 +19,10 @@ package org.jetbrains.kotlin.jps.build
import org.jetbrains.jps.builders.impl.BuildDataPathsImpl
import java.io.File
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl
import kotlin.test.assertTrue
import org.jetbrains.kotlin.jps.incremental.CacheFormatVersion
public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) {
fun testCacheVersionChanged() {
doTest("jps-plugin/testData/incremental/custom/cacheVersionChanged/")
}
@@ -36,9 +35,6 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/")
}
override val allowNoFilesWithSuffixInTestData: Boolean
get() = true
override fun performAdditionalModifications() {
val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION)
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build
import com.intellij.openapi.util.SystemInfoRt
import org.jetbrains.jps.model.java.JavaSourceRootType
public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest() {
public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) {
fun testProjectPathCaseChanged() {
doTest("jps-plugin/testData/incremental/custom/projectPathCaseChanged/")
}
@@ -36,9 +36,6 @@ public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(
super.doTest(testDataPath)
}
override val checkDumpsCaseInsensitively: Boolean
get() = true
override fun performAdditionalModifications() {
val module = myProject.getModules()[0]
val sourceRoot = module.getSourceRoots()[0].getUrl()