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

Fix BuildLogParserParametrizedTest on Windows: normalize line separators

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-01-22 15:31:57 +03:00
parent 6fc5c3325c
commit 21f2b68357
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildLogParserParametrizedTest.kt
+5 -3
View File
@@ -31,11 +31,13 @@ class BuildLogParserParametrizedTest {
@Test @Test
fun testParser() { fun testParser() {
fun String.normalizeSeparators() = replace("\r\n", "\n").trim()
val testDir = File(TEST_ROOT, testDirName) val testDir = File(TEST_ROOT, testDirName)
val logFile = File(testDir, LOG_FILE_NAME) val logFile = File(testDir, LOG_FILE_NAME)
assert(logFile.isFile) { "Log file: $logFile does not exist" } assert(logFile.isFile) { "Log file: $logFile does not exist" }
val actualNormalized = dumpBuildLog(parseTestBuildLog(logFile)).replace("\r\n", "\n").trim() val actualNormalized = dumpBuildLog(parseTestBuildLog(logFile)).normalizeSeparators()
val expectedFile = File(testDir, EXPECTED_PARSED_LOG_FILE_NAME) val expectedFile = File(testDir, EXPECTED_PARSED_LOG_FILE_NAME)
if (!expectedFile.isFile) { if (!expectedFile.isFile) {
@@ -45,11 +47,11 @@ class BuildLogParserParametrizedTest {
throw AssertionError("Expected file log did not exist, created: $expectedFile") throw AssertionError("Expected file log did not exist, created: $expectedFile")
} }
val expectedNormalized = expectedFile.readText().replace("\r\n", "\n").trim() val expectedNormalized = expectedFile.readText().normalizeSeparators()
Assert.assertEquals("Parsed content was unexpected: ", expectedNormalized, actualNormalized) Assert.assertEquals("Parsed content was unexpected: ", expectedNormalized, actualNormalized)
// parse expected, dump again and compare (to check that dumped log can be parsed again) // parse expected, dump again and compare (to check that dumped log can be parsed again)
val reparsedActualNormalized = dumpBuildLog(parseTestBuildLog(expectedFile)).trim() val reparsedActualNormalized = dumpBuildLog(parseTestBuildLog(expectedFile)).normalizeSeparators()
Assert.assertEquals("Reparsed content was unexpected: ", expectedNormalized, reparsedActualNormalized) Assert.assertEquals("Reparsed content was unexpected: ", expectedNormalized, reparsedActualNormalized)
} }