From 2725c7b9aebf95b9590aaf6148bf52dde1c6ffa6 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Fri, 8 Jun 2018 13:50:05 +0300
Subject: [PATCH] 173: jps, mpp: fix AbstractIncrementalJpsTest.kt.173

Original commit: c71357dd76ae942731620c6bed1d8e32cc905c97
---
 .../build/AbstractIncrementalJpsTest.kt.173   | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173
index ae09dec8c6a..db2b97b7c42 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173
@@ -60,9 +60,9 @@ import java.util.concurrent.Future
 import kotlin.reflect.jvm.javaField
 
 abstract class AbstractIncrementalJpsTest(
-        private val allowNoFilesWithSuffixInTestData: Boolean = false,
-        private val checkDumpsCaseInsensitively: Boolean = false,
-        private val allowNoBuildLogFileInTestData: Boolean = false
+    private val allowNoFilesWithSuffixInTestData: Boolean = false,
+    private val checkDumpsCaseInsensitively: Boolean = false,
+    private val allowNoBuildLogFileInTestData: Boolean = false
 ) : BaseKotlinJpsBuildTestCase() {
     companion object {
         private val COMPILATION_FAILED = "COMPILATION FAILED"
@@ -160,11 +160,11 @@ abstract class AbstractIncrementalJpsTest(
 
             if (!buildResult.isSuccessful) {
                 val errorMessages =
-                        buildResult
-                                .getMessages(BuildMessage.Kind.ERROR)
-                                .map { it.messageText }
-                                .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() }
-                                .joinToString("\n")
+                    buildResult
+                        .getMessages(BuildMessage.Kind.ERROR)
+                        .map { it.messageText }
+                        .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() }
+                        .joinToString("\n")
                 return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null)
             }
             else {
@@ -253,13 +253,13 @@ abstract class AbstractIncrementalJpsTest(
     }
 
     protected open fun createBuildLog(incrementalMakeResults: List<AbstractIncrementalJpsTest.MakeResult>): String =
-            buildString {
-                incrementalMakeResults.forEachIndexed { i, makeResult ->
-                    if (i > 0) append("\n")
-                    append("================ Step #${i + 1} =================\n\n")
-                    append(makeResult.log)
-                }
+        buildString {
+            incrementalMakeResults.forEachIndexed { i, makeResult ->
+                if (i > 0) append("\n")
+                append("================ Step #${i + 1} =================\n\n")
+                append(makeResult.log)
             }
+        }
 
     protected open fun doTest(testDataPath: String) {
         testDataDir = File(testDataPath)
@@ -289,9 +289,9 @@ abstract class AbstractIncrementalJpsTest(
         project: ProjectDescriptor,
         dummyCompileContext: CompileContext
     ) = createKotlinIncrementalCacheDump(project, dummyCompileContext) + "\n\n\n" +
-            createLookupCacheDump(project) + "\n\n\n" +
-            createCommonMappingsDump(project) + "\n\n\n" +
-            createJavaMappingsDump(project)
+                createLookupCacheDump(project) + "\n\n\n" +
+                createCommonMappingsDump(project) + "\n\n\n" +
+                createJavaMappingsDump(project)
 
     private fun createKotlinIncrementalCacheDump(
         project: ProjectDescriptor,
@@ -299,9 +299,12 @@ abstract class AbstractIncrementalJpsTest(
     ): String {
         return buildString {
             for (target in project.allModuleTargets.sortedBy { it.presentableName }) {
-                append("<target $target>\n")
-                append(project.dataManager.getKotlinCache(dummyCompileContext.kotlinBuildTargets[target]!!).dump())
-                append("</target $target>\n\n\n")
+                val kotlinCache = project.dataManager.getKotlinCache(dummyCompileContext.kotlinBuildTargets[target])
+                if (kotlinCache != null) {
+                    append("<target $target>\n")
+                    append(kotlinCache.dump())
+                    append("</target $target>\n\n\n")
+                }
             }
         }
     }
@@ -407,7 +410,7 @@ abstract class AbstractIncrementalJpsTest(
         }
         else {
             val nameToModule = moduleDependencies.keys
-                    .keysToMap { addModule(it, arrayOf(getAbsolutePath("$it/src")), null, null, jdk)!! }
+                .keysToMap { addModule(it, arrayOf(getAbsolutePath("$it/src")), null, null, jdk)!! }
 
             for ((moduleName, dependencies) in moduleDependencies) {
                 val module = nameToModule[moduleName]!!
@@ -527,6 +530,6 @@ internal val ProjectDescriptor.allModuleTargets: Collection<ModuleBuildTarget>
 private class DependencyDescriptor(val name: String, val exported: Boolean)
 
 private fun parseDependency(dependency: String): DependencyDescriptor =
-        DependencyDescriptor(dependency.removeSuffix(EXPORTED_SUFFIX), dependency.endsWith(EXPORTED_SUFFIX))
+    DependencyDescriptor(dependency.removeSuffix(EXPORTED_SUFFIX), dependency.endsWith(EXPORTED_SUFFIX))
 
 private val EXPORTED_SUFFIX = "[exported]"