From 30f2dd068451c776d6b16c5aca65f40aac54ed15 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 14 Mar 2016 15:52:40 +0300
Subject: [PATCH] Test: use one function to find test's build log for jps and
 gradle

Original commit: c1a61b17c7817fa17cea9617fbdc193cd1409f9e
---
 .../jps/build/AbstractIncrementalJpsTest.kt    | 18 +++++++-----------
 .../experimentalIncrementalCompilationTests.kt |  4 +++-
 2 files changed, 10 insertions(+), 12 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 d822f30e170..9c1a215df5d 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
@@ -74,8 +74,6 @@ abstract class AbstractIncrementalJpsTest(
         val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory())
 
         val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true"
-
-        private val BUILD_LOG_FILE_NAME = "build.log"
     }
 
     protected open val enableExperimentalIncrementalCompilation = false
@@ -90,7 +88,8 @@ abstract class AbstractIncrementalJpsTest(
 
     protected var mapWorkingToOriginalFile: MutableMap<File, File> = hashMapOf()
 
-    protected open val experimentalBuildLogFileName = "experimental-ic-build.log"
+    protected open val buildLogFinder: BuildLogFinder
+        get() = BuildLogFinder(isExperimentalEnabled = enableExperimentalIncrementalCompilation)
 
     private fun enableDebugLogging() {
         com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java)
@@ -274,18 +273,15 @@ abstract class AbstractIncrementalJpsTest(
         initialMake()
 
         val otherMakeResults = performModificationsAndMake(moduleNames)
-
-        val buildLogFile = File(testDataDir, BUILD_LOG_FILE_NAME)
-        val experimentalBuildLog = File(testDataDir, experimentalBuildLogFileName)
-
+        val buildLogFile = buildLogFinder.findBuildLog(testDataDir)
         val logs = createBuildLog(otherMakeResults)
 
-        if (enableExperimentalIncrementalCompilation && experimentalBuildLog.exists()) {
-            UsefulTestCase.assertSameLinesWithFile(experimentalBuildLog.absolutePath, logs)
-        }
-        else if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) {
+        if (buildLogFile != null && buildLogFile.exists()) {
             UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs)
         }
+        else if (!allowNoBuildLogFileInTestData) {
+            throw IllegalStateException("No build log file in $testDataDir")
+        }
 
         if (!enableExperimentalIncrementalCompilation && File(testDataDir, "dont-check-caches-in-non-experimental-ic.txt").exists()) return
 
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt
index 8dae89c9540..8841eaceb01 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.incremental.ModuleBuildTarget
+import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
 import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider
 
 abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() {
@@ -40,7 +41,8 @@ abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : Abstract
 }
 
 abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() {
-    override val experimentalBuildLogFileName = "data-container-version-build.log"
+    override val buildLogFinder: BuildLogFinder
+        get() = BuildLogFinder(isExperimentalEnabled = true, isDataContainerBuildLogEnabled = true)
 
     override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable<ModuleBuildTarget>) =
             listOf(cacheVersionProvider.dataContainerVersion())