From 65031eb2c97083953433e45981e79b286520d031 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Tue, 4 Aug 2015 15:03:38 +0300
Subject: [PATCH] Minor: move some properties of AbstractIncrementalJpsTest to
 constructor

Original commit: 36f69d9fd6bf990a6d3b379a9ad9129be186d347
---
 .../kotlin/jps/build/AbstractIncrementalJpsTest.kt    | 11 ++++-------
 .../jps/build/IncrementalCacheVersionChangedTest.kt   |  6 +-----
 .../build/IncrementalProjectPathCaseChangedTest.kt    |  5 +----
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 5da8374ea31..0e35256e173 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -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)
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt
index 2df81660a18..97c7880cfc8 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt
@@ -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)
 
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
index 27cb4449ec7..13954948030 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
@@ -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()