diff --git a/compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt b/compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt index dd65cd1c28f..cfd5329d520 100644 --- a/compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt +++ b/compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt @@ -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()}"} () } \ No newline at end of file diff --git a/compiler/testData/codegen/box/argumentOrder/defaults.kt b/compiler/testData/codegen/box/argumentOrder/defaults.kt index 17a94380c82..ebf9b4d7d19 100644 --- a/compiler/testData/codegen/box/argumentOrder/defaults.kt +++ b/compiler/testData/codegen/box/argumentOrder/defaults.kt @@ -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" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/argumentOrder/extension.kt b/compiler/testData/codegen/box/argumentOrder/extension.kt index c298929042c..86fff0d8e1f 100644 --- a/compiler/testData/codegen/box/argumentOrder/extension.kt +++ b/compiler/testData/codegen/box/argumentOrder/extension.kt @@ -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()}" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/argumentOrder/extensionInClass.kt b/compiler/testData/codegen/box/argumentOrder/extensionInClass.kt index 98e666e8c79..ed025997c74 100644 --- a/compiler/testData/codegen/box/argumentOrder/extensionInClass.kt +++ b/compiler/testData/codegen/box/argumentOrder/extensionInClass.kt @@ -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 diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index de6d9d64231..1b66e22edc3 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -335,49 +335,25 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { @TestMetadata("capturedInExtension.kt") public void testCapturedInExtension() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt"); - try { - doTest(fileName); - } - catch (Throwable ignore) { - return; - } - throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); + doTest(fileName); } @TestMetadata("defaults.kt") public void testDefaults() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/defaults.kt"); - try { - doTest(fileName); - } - catch (Throwable ignore) { - return; - } - throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); + doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/extension.kt"); - try { - doTest(fileName); - } - catch (Throwable ignore) { - return; - } - throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); + doTest(fileName); } @TestMetadata("extensionInClass.kt") public void testExtensionInClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/extensionInClass.kt"); - try { - doTest(fileName); - } - catch (Throwable ignore) { - return; - } - throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); + doTest(fileName); } @TestMetadata("kt9277.kt")