From b4d8337ca5cab339f6fe619c282a76d37ba8b307 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 18 Jul 2017 11:56:43 +0300 Subject: [PATCH] Ignore test for 'primitive Char == object' in JS (KT-19081) --- .../equalityWithObject/generated/primitiveEqObjectChar.kt | 1 + .../tests/GeneratePrimitiveVsObjectEqualityTestData.kt | 5 +++-- .../js/test/semantics/JsCodegenBoxTestGenerated.java | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectChar.kt b/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectChar.kt index 6122439bcb6..c10e9d0249e 100644 --- a/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectChar.kt +++ b/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectChar.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND: JS // Auto-generated by GeneratePrimitiveVsObjectEqualityTestData. Do not edit! val nx: Any? = '0' diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt index ba37ce76793..69970935934 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt @@ -131,8 +131,9 @@ object GeneratePrimitiveVsObjectEqualityTestData { println("}") } - private fun generatePrimitiveVsObjectTest(type: String, x: String, y: String) { + private fun generatePrimitiveVsObjectTest(type: String, x: String, y: String, header: String = "") { PrintWriter(File(GENERATED_DIR, "primitiveEqObject$type.kt")).use { + if (header.isNotBlank()) it.println(header) it.generatePrimitiveVsObjectTestBody(type, x, y) } } @@ -204,7 +205,7 @@ object GeneratePrimitiveVsObjectEqualityTestData { generatePrimitiveVsBoxedTest("Long", "0L", "1L") generatePrimitiveVsObjectTest("Boolean", "true", "false") - generatePrimitiveVsObjectTest("Char", "'0'", "'1'") + generatePrimitiveVsObjectTest("Char", "'0'", "'1'", header = "// IGNORE_BACKEND: JS") // KT-19081 generatePrimitiveVsObjectTest("Byte", "0.toByte()", "1.toByte()") generatePrimitiveVsObjectTest("Short", "0.toShort()", "1.toShort()") generatePrimitiveVsObjectTest("Int", "0", "1") 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 489cc863efc..2babc736eb7 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 @@ -14079,7 +14079,13 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { @TestMetadata("primitiveEqObjectChar.kt") public void testPrimitiveEqObjectChar() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/generated/primitiveEqObjectChar.kt"); - doTest(fileName); + try { + doTest(fileName); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); } @TestMetadata("primitiveEqObjectInt.kt")