From f967edfaeb250f1e45b12fe2708c16dcd550a0c9 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 11 Aug 2016 16:05:25 +0300 Subject: [PATCH] Join paths to string for better assertion message in idea --- .../kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 31643b5abec..6be017bd059 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlin.gradle.util.createGradleCommand import org.jetbrains.kotlin.gradle.util.runProcess import org.junit.After import org.junit.AfterClass +import org.junit.Assert import org.junit.Before import java.io.File import kotlin.test.* @@ -216,10 +217,10 @@ abstract class BaseGradleIT { return map { it.canonicalFile.toRelativeString(project.projectDir) } } - fun CompiledProject.assertSameFiles(expected: Iterable, actual: Iterable, messagePrefix: String = ""): CompiledProject { - val expectedSet = expected.toSortedSet() - val actualSet = actual.toSortedSet() - assertTrue(actualSet == expectedSet, messagePrefix + "expected files: ${expectedSet.joinToString()}\n != actual files: ${actualSet.joinToString()}") + fun CompiledProject.assertSameFiles(expected: Iterable, actual: Iterable, messagePrefix: String): CompiledProject { + val expectedSet = expected.toSortedSet().joinToString("\n") + val actualSet = actual.toSortedSet().joinToString("\n") + Assert.assertEquals(messagePrefix, expectedSet, actualSet) return this }