azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve test error message

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-05-27 22:07:09 +03:00
parent e1457ffea0
commit a6a829c272
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+20 -7
View File
@@ -367,17 +367,30 @@ abstract class BaseGradleIT {
weakTesting: Boolean = false, weakTesting: Boolean = false,
tasks: List<String>) { tasks: List<String>) {
for (task in tasks) { 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 = fun CompiledProject.assertCompiledKotlinSources(
if (weakTesting) expectedSources: Iterable<String>,
assertContainFiles(sources, getCompiledKotlinSources(output).projectRelativePaths(this.project), "Compiled Kotlin files differ:\n ") weakTesting: Boolean = false,
else output: String = this.output,
assertSameFiles(sources, getCompiledKotlinSources(output).projectRelativePaths(this.project), "Compiled Kotlin files differ:\n ") 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) if (weakTesting)
assertContainFiles(sources, compiledJavaSources.projectRelativePaths(this.project), "Compiled Java files differ:\n ") assertContainFiles(sources, compiledJavaSources.projectRelativePaths(this.project), "Compiled Java files differ:\n ")
else else
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
+2 -3
View File
@@ -210,12 +210,11 @@ abstract class KaptIncrementalBaseIT(val shouldUseStubs: Boolean, val useKapt3:
assertKapt3FullyExecuted() assertKapt3FullyExecuted()
val useBKt = project.projectDir.getFileByName("useB.kt") val useBKt = project.projectDir.getFileByName("useB.kt")
assertCompiledKotlinSources(project.relativize(bKt, useBKt), assertCompiledKotlinSources(project.relativize(bKt, useBKt), tasks = listOf("kaptGenerateStubsKotlin"))
output = getOutputForTask("kaptGenerateStubsKotlin"))
// java removal is detected // java removal is detected
assertCompiledKotlinSources(project.relativize(project.projectDir.allKotlinFiles()), assertCompiledKotlinSources(project.relativize(project.projectDir.allKotlinFiles()),
output = getOutputForTask("compileKotlin")) tasks = listOf("kaptGenerateStubsKotlin"))
} }
else if (shouldUseStubs) { else if (shouldUseStubs) {
// java removal is detected // java removal is detected