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

Gradle, Kotlin/JS: fix failing tests on Windows

Browse Source
This commit is contained in:
Sergey Rostov
2019-03-26 16:17:50 +03:00
parent 0237dc3f4b
commit 6bf82c1053
4 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+3
View File
@@ -51,12 +51,15 @@ projectTest {
dependsOn(":kotlin-gradle-plugin:validateTaskProperties")
dependsOn(
":kotlin-allopen:install",
":kotlin-allopen:plugin-marker:install",
":kotlin-noarg:install",
":kotlin-allopen:plugin-marker:install",
":kotlin-sam-with-receiver:install",
":kotlin-android-extensions:install",
":kotlin-build-common:install",
":kotlin-compiler-embeddable:install",
":kotlin-gradle-plugin:install",
":kotlin-gradle-plugin:plugin-marker:install",
":kotlin-reflect:install",
":kotlin-annotation-processing-gradle:install",
":kotlin-test:kotlin-test-jvm:install",
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+16 -12
View File
@@ -11,6 +11,7 @@ import org.jdom.output.XMLOutputter
import org.jetbrains.kotlin.gradle.model.ModelContainer
import org.jetbrains.kotlin.gradle.model.ModelFetcherBuildAction
import org.jetbrains.kotlin.gradle.util.*
import org.jetbrains.kotlin.test.util.trimTrailingWhitespaces
import org.junit.After
import org.junit.AfterClass
import org.junit.Assert
@@ -611,12 +612,9 @@ abstract class BaseGradleIT {
}
val actualTestResults = readAndCleanupTestResults(testReportDir, projectDir)
val expectedTestResults = resourcesRootFile.resolve(assertionFileName).readText()
val expectedTestResults = prettyPrintXml(resourcesRootFile.resolve(assertionFileName).readText())
assertEquals(
prettyPrintXml(expectedTestResults),
prettyPrintXml(actualTestResults)
)
assertEquals(expectedTestResults, actualTestResults)
}
private fun readAndCleanupTestResults(testReportDir: File, projectDir: File): String {
@@ -628,14 +626,20 @@ abstract class BaseGradleIT {
it.name.replace(".xml", ".A.xml")
}
val xmlString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results>\n" +
files.joinToString("") {
val xmlString = buildString {
appendln("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
appendln("<results>")
files.forEach {
appendln(
it.readText()
.replace(projectDir.absolutePath, "/\$PROJECT_DIR$")
.replace(projectDir.name, "\$PROJECT_NAME$")
.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")
} +
"</results>"
.trimTrailingWhitespaces()
.replace(projectDir.absolutePath, "/\$PROJECT_DIR$")
.replace(projectDir.name, "\$PROJECT_NAME$")
.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")
)
}
appendln("</results>")
}
val doc = SAXBuilder().build(xmlString.reader())
val skipAttrs = setOf("timestamp", "hostname", "time", "message")