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

JS: make some JVM tests compatible with JS BE

Browse Source
This commit is contained in:
Alexey Andreev
2016-12-30 15:09:08 +03:00
parent 70176dfacc
commit bad6f41d6e
5 changed files with 12 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt
Vendored
+2 -5
View File
@@ -1,9 +1,6 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
fun box(): String {
var invokeOrder = "";
val expectedResult = "1.0_0_1_9"
val expectedResult = "1_0_1_9"
val expectedInvokeOrder = "1_0_9"
var l = 1L
var i = 0
@@ -29,5 +26,5 @@ fun box(): String {
}
fun Double.test(a: Int, b: Long, c: () -> String): String {
return { "${this}_${a}_${b}_${c()}"} ()
return { "${this.toInt()}_${a}_${b}_${c()}"} ()
}
compiler/testData/codegen/box/argumentOrder/defaults.kt
Vendored
+2 -5
View File
@@ -1,16 +1,13 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
var invokeOrder: String = ""
fun test(x: Double = { invokeOrder += "x"; 1.0 }(), a: String, y: Long = { invokeOrder += "y"; 1 }(), b: String): String {
return "" + x + a + b + y;
return "" + x.toInt() + a + b + y;
}
fun box(): String {
val funResult = test(b = { invokeOrder += "K"; "K" }(), a = { invokeOrder += "O"; "O" }())
if (invokeOrder != "KOxy" || funResult != "1.0OK1") return "fail: $invokeOrder != KOxy or $funResult != 1.0OK1"
if (invokeOrder != "KOxy" || funResult != "1OK1") return "fail: $invokeOrder != KOxy or $funResult != 1OK1"
return "OK"
}
compiler/testData/codegen/box/argumentOrder/extension.kt
Vendored
+2 -5
View File
@@ -1,9 +1,6 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
fun box(): String {
var invokeOrder = "";
val expectedResult = "1.0_0_1_L"
val expectedResult = "1_0_1_L"
val expectedInvokeOrder = "1_0_L"
var l = 1L
var i = 0
@@ -29,5 +26,5 @@ fun box(): String {
}
fun Double.test(a: Int, b: Long, c: () -> String): String {
return "${this}_${a}_${b}_${c()}"
return "${this.toInt()}_${a}_${b}_${c()}"
}
compiler/testData/codegen/box/argumentOrder/extensionInClass.kt
Vendored
+2 -5
View File
@@ -1,19 +1,16 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
fun box(): String {
return Z().test()
}
class Z {
fun Double.test(a: Int, b: Long, c: () -> String): String {
return "${this}_${a}_${b}_${c()}"
return "${this.toInt()}_${a}_${b}_${c()}"
}
fun test(): String {
var invokeOrder = "";
val expectedResult = "1.0_0_1_L"
val expectedResult = "1_0_1_L"
val expectedInvokeOrder = "1_0_L"
var l = 1L
var i = 0