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

KT-2752: fix some tests and make them slightly less fragile

Browse Source
This commit is contained in:
Alexey Andreev
2016-09-23 15:20:36 +03:00
parent 9c7c82b151
commit 831ac97ecd
8 changed files with 96 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/box/expression/function/mangling.kt
Vendored
+50 -39
View File
@@ -161,72 +161,83 @@ fun test(expected: String, f: () -> Unit) {
}
}
val privateMangledRegex = Regex("baz_[0-9a-zA-Z]+\\\$_0")
fun testMangledPrivate(f: () -> Unit) {
val actual = f.extractNames()
if (!privateMangledRegex.matches(actual[1])) {
fail("Failed on '$testGroup' group: actual[1] = \"${actual[1]}\"\n actual = $actual, should look like 'baz_<hash>_0'")
}
if ("_za3lpa\$" in actual[1]) {
fail("Failed on '$testGroup' group: actual[1] = \"${actual[1]}\"\n actual = $actual, should not contains 'za3lpa\$'")
}
}
public fun stable_mangled_baz(i: Int) {
}
val SIMPLE = "baz"
val SIMPLE1 = "${SIMPLE}_1"
val SIMPLE0 = "${SIMPLE}_0"
val NATIVE = SIMPLE
val STABLE = { stable_mangled_baz(0) }.extractNames()[1]
fun box(): String {
// TODO: these tests are too fragile
testGroup = "Top Level"
test(STABLE) { public_baz(0) }
test(NATIVE) { public_baz("native") }
//test(SIMPLE1) { internal_baz(0) }
//test(NATIVE) { internal_baz("native") }
//test(SIMPLE1) { private_baz(0) }
//test(NATIVE) { private_baz("native") }
test(SIMPLE0) { internal_baz(0) }
test(NATIVE) { internal_baz("native") }
test(SIMPLE0) { private_baz(0) }
test(NATIVE) { private_baz("native") }
testGroup = "Public Class"
test(STABLE) { PublicClass().public_baz(0) }
test(NATIVE) { PublicClass().public_baz("native") }
//test(SIMPLE1) { PublicClass().internal_baz(0) }
//test(NATIVE) { PublicClass().internal_baz("native") }
//test(SIMPLE1, PublicClass().call_private_baz)
//test(NATIVE, PublicClass().call_private_native_baz)
test(SIMPLE0) { PublicClass().internal_baz(0) }
test(NATIVE) { PublicClass().internal_baz("native") }
test(SIMPLE0, PublicClass().call_private_baz)
test(NATIVE, PublicClass().call_private_native_baz)
testGroup = "Internal Class"
//test(SIMPLE1) { InternalClass().public_baz(0) }
//test(NATIVE) { InternalClass().public_baz("native") }
//test(SIMPLE1) { InternalClass().internal_baz(0) }
//test(NATIVE) { InternalClass().internal_baz("native") }
//test(SIMPLE1, InternalClass().call_private_baz)
//test(NATIVE, InternalClass().call_private_native_baz)
test(STABLE) { InternalClass().public_baz(0) }
test(NATIVE) { InternalClass().public_baz("native") }
test(SIMPLE0) { InternalClass().internal_baz(0) }
test(NATIVE) { InternalClass().internal_baz("native") }
test(SIMPLE0, InternalClass().call_private_baz)
test(NATIVE, InternalClass().call_private_native_baz)
testGroup = "Private Class"
//test(SIMPLE1) { PrivateClass().public_baz(0) }
//test(NATIVE) { PrivateClass().public_baz("native") }
//test(SIMPLE1) { PrivateClass().internal_baz(0) }
//test(NATIVE) { PrivateClass().internal_baz("native") }
//test(SIMPLE1, PrivateClass().call_private_baz)
//test(NATIVE, PrivateClass().call_private_native_baz)
test(STABLE) { PrivateClass().public_baz(0) }
test(NATIVE) { PrivateClass().public_baz("native") }
test(SIMPLE0) { PrivateClass().internal_baz(0) }
test(NATIVE) { PrivateClass().internal_baz("native") }
test(SIMPLE0, PrivateClass().call_private_baz)
test(NATIVE, PrivateClass().call_private_native_baz)
testGroup = "Open Public Class"
test(STABLE) { OpenPublicClass().public_baz(0) }
test(NATIVE) { OpenPublicClass().public_baz("native") }
//test(STABLE) { OpenPublicClass().internal_baz(0) }
//test(NATIVE) { OpenPublicClass().internal_baz("native") }
//test(STABLE, OpenPublicClass().call_private_baz)
//test(NATIVE, OpenPublicClass().call_private_native_baz)
testMangledPrivate { OpenPublicClass().internal_baz(0) }
test(NATIVE) { OpenPublicClass().internal_baz("native") }
testMangledPrivate(OpenPublicClass().call_private_baz)
test(NATIVE, OpenPublicClass().call_private_native_baz)
testGroup = "Open Internal Class"
//test(STABLE) { OpenInternalClass().public_baz(0) }
//test(NATIVE) { OpenInternalClass().public_baz("native") }
//test(STABLE) { OpenInternalClass().internal_baz(0) }
//test(NATIVE) { OpenInternalClass().internal_baz("native") }
//test(STABLE, OpenInternalClass().call_private_baz)
//test(NATIVE, OpenInternalClass().call_private_native_baz)
test(STABLE) { OpenInternalClass().public_baz(0) }
test(NATIVE) { OpenInternalClass().public_baz("native") }
test(SIMPLE0) { OpenInternalClass().internal_baz(0) }
test(NATIVE) { OpenInternalClass().internal_baz("native") }
test(SIMPLE0, OpenInternalClass().call_private_baz)
test(NATIVE, OpenInternalClass().call_private_native_baz)
testGroup = "Open Private Class"
//test(STABLE) { OpenPrivateClass().public_baz(0) }
//test(NATIVE) { OpenPrivateClass().public_baz("native") }
//test(STABLE) { OpenPrivateClass().internal_baz(0) }
//test(NATIVE) { OpenPrivateClass().internal_baz("native") }
//test(STABLE, OpenPrivateClass().call_private_baz)
//test(NATIVE, OpenPrivateClass().call_private_native_baz)
test(STABLE) { OpenPrivateClass().public_baz(0) }
test(NATIVE) { OpenPrivateClass().public_baz("native") }
test(SIMPLE0) { OpenPrivateClass().internal_baz(0) }
test(NATIVE) { OpenPrivateClass().internal_baz("native") }
test(SIMPLE0, OpenPrivateClass().call_private_baz)
test(NATIVE, OpenPrivateClass().call_private_native_baz)
return "OK"
}