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

[Gradle, K/N] Fix native test execution test on Macs

Browse Source
This commit is contained in:
Alexander Likhachev
2021-03-03 16:35:29 +03:00
parent 8588412a56
commit aedd8a104d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
+3 -3
View File
@@ -694,11 +694,11 @@ class GeneralNativeIT : BaseGradleIT() {
assertTasksSkipped(*testsToSkip.toTypedArray()) assertTasksSkipped(*testsToSkip.toTypedArray())
fun assertStacktrace(taskName: String) { fun assertStacktrace(taskName: String, targetName: String) {
val testReport = projectDir.resolve("build/test-results/$taskName/TEST-org.foo.test.TestKt.xml") val testReport = projectDir.resolve("build/test-results/$taskName/TEST-org.foo.test.TestKt.xml")
val stacktrace = SAXBuilder().build(testReport).rootElement val stacktrace = SAXBuilder().build(testReport).rootElement
.getChildren("testcase") .getChildren("testcase")
.single { it.getAttribute("name").value == "fail" } .single { it.getAttribute("name").value == "fail" || it.getAttribute("name").value == "fail[$targetName]" }
.getChild("failure") .getChild("failure")
.text .text
assertTrue(stacktrace.contains("""at org\.foo\.test#fail\(.*test\.kt:24\)""".toRegex())) assertTrue(stacktrace.contains("""at org\.foo\.test#fail\(.*test\.kt:24\)""".toRegex()))
@@ -741,7 +741,7 @@ class GeneralNativeIT : BaseGradleIT() {
expectedTestResults[1], expectedTestResults[1],
"iosTest" "iosTest"
) )
assertStacktrace("iosTest") assertStacktrace("iosTest", "ios")
} }
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<properties/> <properties/>
<testcase name="fooTest[ios]" classname="org.foo.test.TestKt" time="..."/> <testcase name="fooTest[ios]" classname="org.foo.test.TestKt" time="..."/>
<testcase name="barTest[ios]" classname="org.foo.test.TestKt" time="..."/> <testcase name="barTest[ios]" classname="org.foo.test.TestKt" time="..."/>
<testcase name="fail[ios" classname="org.foo.test.TestKt" time="..."> <testcase name="fail[ios]" classname="org.foo.test.TestKt" time="...">
<failure message="..." type="kotlin.IllegalStateException">...</failure> <failure message="..." type="kotlin.IllegalStateException">...</failure>
</testcase> </testcase>
<system-out><![CDATA[Foo call <system-out><![CDATA[Foo call