From a6a829c2724ccea159b0e45e80bc8439135b8131 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Sat, 27 May 2017 22:07:09 +0300
Subject: [PATCH] Improve test error message

---
 .../jetbrains/kotlin/gradle/BaseGradleIT.kt   | 27 ++++++++++++++-----
 .../kotlin/gradle/KaptIncrementalIT.kt        |  5 ++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
index 5e3b2249e90..c31561538d4 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
@@ -367,17 +367,30 @@ abstract class BaseGradleIT {
             weakTesting: Boolean = false,
             tasks: List<String>) {
         for (task in tasks) {
-            assertCompiledKotlinSources(sources, weakTesting, getOutputForTask(task))
+            assertCompiledKotlinSources(sources, weakTesting, getOutputForTask(task), suffix = " in task ${task}")
         }
     }
 
-    fun CompiledProject.assertCompiledKotlinSources(sources: Iterable<String>, weakTesting: Boolean = false, output: String = this.output): CompiledProject =
-            if (weakTesting)
-                assertContainFiles(sources, getCompiledKotlinSources(output).projectRelativePaths(this.project), "Compiled Kotlin files differ:\n  ")
-            else
-                assertSameFiles(sources, getCompiledKotlinSources(output).projectRelativePaths(this.project), "Compiled Kotlin files differ:\n  ")
+    fun CompiledProject.assertCompiledKotlinSources(
+            expectedSources: Iterable<String>,
+            weakTesting: Boolean = false,
+            output: String = this.output,
+            suffix: String = ""
+    ): CompiledProject {
+        val messagePrefix = "Compiled Kotlin files differ${suffix}:\n  "
+        val actualSources = getCompiledKotlinSources(output).projectRelativePaths(this.project)
+        return if (weakTesting) {
+            assertContainFiles(expectedSources, actualSources, messagePrefix)
+        }
+        else {
+            assertSameFiles(expectedSources, actualSources, messagePrefix)
+        }
+    }
 
-    fun CompiledProject.assertCompiledJavaSources(sources: Iterable<String>, weakTesting: Boolean = false): CompiledProject =
+    fun CompiledProject.assertCompiledJavaSources(
+            sources: Iterable<String>,
+            weakTesting: Boolean = false
+    ): CompiledProject =
             if (weakTesting)
                 assertContainFiles(sources, compiledJavaSources.projectRelativePaths(this.project), "Compiled Java files differ:\n  ")
             else
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
index 5bf5cf8fe18..f0612e8e750 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
@@ -210,12 +210,11 @@ abstract class KaptIncrementalBaseIT(val shouldUseStubs: Boolean, val useKapt3:
                 assertKapt3FullyExecuted()
 
                 val useBKt = project.projectDir.getFileByName("useB.kt")
-                assertCompiledKotlinSources(project.relativize(bKt, useBKt),
-                        output = getOutputForTask("kaptGenerateStubsKotlin"))
+                assertCompiledKotlinSources(project.relativize(bKt, useBKt), tasks = listOf("kaptGenerateStubsKotlin"))
 
                 // java removal is detected
                 assertCompiledKotlinSources(project.relativize(project.projectDir.allKotlinFiles()),
-                        output = getOutputForTask("compileKotlin"))
+                        tasks = listOf("kaptGenerateStubsKotlin"))
             }
             else if (shouldUseStubs) {
                 // java removal is detected