diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt index 638c8d99fb0..59fdc5594ee 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt @@ -1,8 +1,8 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER + // TODO: muted automatically, investigate should it be ran for JS or not // IGNORE_BACKEND: JS -// !DIAGNOSTICS: -UNUSED_PARAMETER - class B { inner class C { tailrec fun h(counter : Int) { diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt index c6e91261b08..d148c954514 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt @@ -1,7 +1,8 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER + // TODO: muted automatically, investigate should it be ran for JS or not // IGNORE_BACKEND: JS -// !DIAGNOSTICS: -UNUSED_PARAMETER tailrec fun foo() { bar { foo() diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt index 3ee20329a19..6a66c51ad80 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt @@ -1,8 +1,8 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER + // TODO: muted automatically, investigate should it be ran for JS or not // IGNORE_BACKEND: JS -// !DIAGNOSTICS: -UNUSED_PARAMETER - tailrec fun withWhen(counter : Int, d : Any) : Int = when (counter) { 0 -> counter diff --git a/compiler/testData/codegen/box/smap/chainCalls.kt b/compiler/testData/codegen/box/smap/chainCalls.kt index d0b425e3bc5..73da8b97720 100644 --- a/compiler/testData/codegen/box/smap/chainCalls.kt +++ b/compiler/testData/codegen/box/smap/chainCalls.kt @@ -1,6 +1,4 @@ -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS - +// TARGET_BACKEND: JVM // WITH_RUNTIME // FULL_JDK package test @@ -15,7 +13,7 @@ fun testProperLineNumber(): String { catch(e: AssertionError) { val entry = (e as java.lang.Throwable).getStackTrace()!!.get(1) val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("chainCalls.kt:9" != actual) { + if ("chainCalls.kt:10" != actual) { return "fail 1: ${actual}" } exceptionCount++ @@ -29,7 +27,7 @@ fun testProperLineNumber(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("chainCalls.kt:24" != actual) { + if ("chainCalls.kt:25" != actual) { return "fail 2: ${actual}" } exceptionCount++ @@ -42,7 +40,7 @@ fun testProperLineNumber(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("chainCalls.kt:37" != actual) { + if ("chainCalls.kt:38" != actual) { return "fail 3: ${actual}" } exceptionCount++ @@ -54,7 +52,7 @@ fun testProperLineNumber(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("chainCalls.kt:49" != actual) { + if ("chainCalls.kt:50" != actual) { return "fail 4: ${actual}" } exceptionCount++ diff --git a/compiler/testData/codegen/box/smap/infixCalls.kt b/compiler/testData/codegen/box/smap/infixCalls.kt index 26c38686eac..eeab32d82e9 100644 --- a/compiler/testData/codegen/box/smap/infixCalls.kt +++ b/compiler/testData/codegen/box/smap/infixCalls.kt @@ -1,6 +1,4 @@ -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS - +// TARGET_BACKEND: JVM // WITH_RUNTIME // FULL_JDK package test @@ -13,7 +11,7 @@ fun testProperLineNumber(): String { catch(e: AssertionError) { val entry = (e as java.lang.Throwable).getStackTrace()!!.get(1) val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("infixCalls.kt:7" != actual) { + if ("infixCalls.kt:8" != actual) { return "fail 1: ${actual}" } exceptionCount++ @@ -26,7 +24,7 @@ fun testProperLineNumber(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("infixCalls.kt:20" != actual) { + if ("infixCalls.kt:21" != actual) { return "fail 1: ${actual}" } exceptionCount++ @@ -38,7 +36,7 @@ fun testProperLineNumber(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("infixCalls.kt:33" != actual) { + if ("infixCalls.kt:34" != actual) { return "fail 1: ${actual}" } exceptionCount++ diff --git a/compiler/testData/codegen/box/smap/simpleCallWithParams.kt b/compiler/testData/codegen/box/smap/simpleCallWithParams.kt index 5ccbb64ef99..8c0830bc26e 100644 --- a/compiler/testData/codegen/box/smap/simpleCallWithParams.kt +++ b/compiler/testData/codegen/box/smap/simpleCallWithParams.kt @@ -1,6 +1,4 @@ -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS - +// TARGET_BACKEND: JVM // WITH_RUNTIME // FULL_JDK package test @@ -13,7 +11,7 @@ fun testProperLineNumberAfterInline(): String { catch(e: AssertionError) { val entry = (e as java.lang.Throwable).getStackTrace()!!.get(1) val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("simpleCallWithParams.kt:7" != actual) { + if ("simpleCallWithParams.kt:8" != actual) { return "fail 1: ${actual}" } exceptionCount++ @@ -26,7 +24,7 @@ fun testProperLineNumberAfterInline(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("simpleCallWithParams.kt:20" != actual) { + if ("simpleCallWithParams.kt:21" != actual) { return "fail 2: ${actual}" } exceptionCount++ @@ -44,7 +42,7 @@ fun testProperLineForOtherParameters(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("simpleCallWithParams.kt:38" != actual) { + if ("simpleCallWithParams.kt:39" != actual) { return "fail 3: ${actual}" } exceptionCount++ @@ -58,7 +56,7 @@ fun testProperLineForOtherParameters(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("simpleCallWithParams.kt:52" != actual) { + if ("simpleCallWithParams.kt:53" != actual) { return "fail 4: ${actual}" } exceptionCount++ @@ -70,7 +68,7 @@ fun testProperLineForOtherParameters(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("simpleCallWithParams.kt:65" != actual) { + if ("simpleCallWithParams.kt:66" != actual) { return "fail 5: ${actual}" } exceptionCount++ @@ -82,7 +80,7 @@ fun testProperLineForOtherParameters(): String { catch(e: AssertionError) { val entry = e.stackTrace!![1] val actual = "${entry.getFileName()}:${entry.getLineNumber()}" - if ("simpleCallWithParams.kt:77" != actual) { + if ("simpleCallWithParams.kt:78" != actual) { return "fail 6: ${actual}" } exceptionCount++ 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 018e4e1de22..75fa3b9bcb4 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 @@ -19288,38 +19288,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/smap"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true); } - @TestMetadata("chainCalls.kt") - public void testChainCalls() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/smap/chainCalls.kt"); - try { - doTest(fileName); - throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); - } - catch (Throwable ignore) { - } - } - - @TestMetadata("infixCalls.kt") - public void testInfixCalls() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/smap/infixCalls.kt"); - try { - doTest(fileName); - throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); - } - catch (Throwable ignore) { - } - } - - @TestMetadata("simpleCallWithParams.kt") - public void testSimpleCallWithParams() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/smap/simpleCallWithParams.kt"); - try { - doTest(fileName); - throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); - } - catch (Throwable ignore) { - } - } } @TestMetadata("compiler/testData/codegen/box/smartCasts")