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

Make assertion message more readable in JPS test

Browse Source 
The test was failing recently on CI, but assertion message
does not give enough info: arrays' sizes are not equal,
so there were extra warnings, but what they were?

Original commit: adc3e61742
This commit is contained in:
Alexey Tsvetkov
2018-04-09 05:51:06 +03:00
parent 1ad96a7db9
commit bdd795200c
2 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+18 -14
View File
@@ -807,28 +807,32 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
} }
fun testFileDoesNotExistWarning() { fun testFileDoesNotExistWarning() {
fun absoluteFiles(vararg paths: String): Array<File> =
paths.map { File(it).absoluteFile }.toTypedArray()
initProject(JVM_MOCK_RUNTIME) initProject(JVM_MOCK_RUNTIME)
val filesToBeReported = absoluteFiles("badroot.jar", "some/test.class")
val otherFiles = absoluteFiles("test/other/file.xml", "some/other/baddir")
AbstractKotlinJpsBuildTestCase.addDependency( AbstractKotlinJpsBuildTestCase.addDependency(
JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "LibraryWithBadRoots", JpsJavaDependencyScope.COMPILE,
File("badroot.jar"), Lists.newArrayList(findModule("module")),
File("test/other/file.xml"), false,
File("some/test.class"), "LibraryWithBadRoots",
File("some/other/baddir")) *(filesToBeReported + otherFiles)
)
val result = buildAllModules() val result = buildAllModules()
result.assertSuccessful() result.assertSuccessful()
val warnings = result.getMessages(BuildMessage.Kind.WARNING) val actualWarnings = result.getMessages(BuildMessage.Kind.WARNING).map { it.messageText }
val expectedWarnings = filesToBeReported.map { "Classpath entry points to a non-existent location: $it" }
Assert.assertArrayEquals( val expectedText = expectedWarnings.sorted().joinToString("\n")
arrayOf( val actualText = actualWarnings.sorted().joinToString("\n")
"""Classpath entry points to a non-existent location: TEST_PATH/badroot.jar""",
"""Classpath entry points to a non-existent location: TEST_PATH/some/test.class"""), Assert.assertEquals(expectedText, actualText)
warnings.map {
it.messageText.replace(File("").absolutePath, "TEST_PATH").replace("\\", "/")
}.sorted().toTypedArray()
)
} }
fun testHelp() { fun testHelp() {
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.172
+18 -14
View File
@@ -806,28 +806,32 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
} }
fun testFileDoesNotExistWarning() { fun testFileDoesNotExistWarning() {
fun absoluteFiles(vararg paths: String): Array<File> =
paths.map { File(it).absoluteFile }.toTypedArray()
initProject(JVM_MOCK_RUNTIME) initProject(JVM_MOCK_RUNTIME)
val filesToBeReported = absoluteFiles("badroot.jar", "some/test.class")
val otherFiles = absoluteFiles("test/other/file.xml", "some/other/baddir")
AbstractKotlinJpsBuildTestCase.addDependency( AbstractKotlinJpsBuildTestCase.addDependency(
JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "LibraryWithBadRoots", JpsJavaDependencyScope.COMPILE,
File("badroot.jar"), Lists.newArrayList(findModule("module")),
File("test/other/file.xml"), false,
File("some/test.class"), "LibraryWithBadRoots",
File("some/other/baddir")) *(filesToBeReported + otherFiles)
)
val result = buildAllModules() val result = buildAllModules()
result.assertSuccessful() result.assertSuccessful()
val warnings = result.getMessages(BuildMessage.Kind.WARNING) val actualWarnings = result.getMessages(BuildMessage.Kind.WARNING).map { it.messageText }
val expectedWarnings = filesToBeReported.map { "Classpath entry points to a non-existent location: $it" }
Assert.assertArrayEquals( val expectedText = expectedWarnings.sorted().joinToString("\n")
arrayOf( val actualText = actualWarnings.sorted().joinToString("\n")
"""Classpath entry points to a non-existent location: TEST_PATH/badroot.jar""",
"""Classpath entry points to a non-existent location: TEST_PATH/some/test.class"""), Assert.assertEquals(expectedText, actualText)
warnings.map {
it.messageText.replace(File("").absolutePath, "TEST_PATH").replace("\\", "/")
}.sorted().toTypedArray()
)
} }
fun testHelp() { fun testHelp() {