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

FirTestDataConsistencyHandler: fix behavior on Windows (partial revert)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-08-10 10:06:26 +03:00
committed by TeamCityServer
parent 512a851c65
commit 8c51c3c5c3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt
+13 -5
View File
@@ -29,14 +29,22 @@ class FirTestDataConsistencyHandler(testServices: TestServices) : AfterAnalysisC
testServices.assertions.assertTrue(firTestData.exists()) { testServices.assertions.assertTrue(firTestData.exists()) {
"FIR test data does not exist; run the corresponding FIR test to generate it" "FIR test data does not exist; run the corresponding FIR test to generate it"
} }
testServices.assertions.assertEquals(firTestData.preprocessSource(), testData.preprocessSource()) { val firPreprocessedTextData = firTestData.preprocessSource()
"Original and fir test data aren't identical. " + val originalPreprocessedTextData = testData.preprocessSource()
testServices.assertions.assertEquals(firPreprocessedTextData, originalPreprocessedTextData) {
"Original and FIR test data aren't identical. " +
"Please, add changes from ${testData.name} to ${firTestData.name}" "Please, add changes from ${testData.name} to ${firTestData.name}"
} }
} }
private fun File.preprocessSource(): String = private fun File.preprocessSource(): String {
testServices.sourceFileProvider.getContentOfSourceFile( val content = testServices.sourceFileProvider.getContentOfSourceFile(
TestFile(path, readText().trim().convertLineSeparators(), this, 0, isAdditional = false, RegisteredDirectives.Empty) TestFile(path, readText().trim(), this, 0, isAdditional = false, RegisteredDirectives.Empty)
) )
// Note: convertSeparators() does not work on Windows properly (\r\n are left intact for some reason)
if (System.lineSeparator() != "\n") {
return content.replace("\r\n", "\n")
}
return content
}
} }