From 14e38ff6d49c74dd588a186dffeb7fc73102efae Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 19 Oct 2015 10:09:26 +0300 Subject: [PATCH] data deprecations cleanup: reserved word tests fixed --- .../tests/generateTestDataForReservedWords.kt | 13 +++++++--- .../semantics/ReservedWordTestGenerated.java | 24 ------------------- .../reservedWords/cases/dataClassParamElse.kt | 15 ------------ .../cases/dataClassParamFalse.kt | 15 ------------ .../cases/dataClassParamInfinity.kt | 15 ------------ .../cases/dataClassParamKotlin.kt | 15 ------------ 6 files changed, 10 insertions(+), 87 deletions(-) delete mode 100644 js/js.translator/testData/reservedWords/cases/dataClassParamElse.kt delete mode 100644 js/js.translator/testData/reservedWords/cases/dataClassParamFalse.kt delete mode 100644 js/js.translator/testData/reservedWords/cases/dataClassParamInfinity.kt delete mode 100644 js/js.translator/testData/reservedWords/cases/dataClassParamKotlin.kt diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index 39794b4d047..d89bb304f48 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -158,7 +158,7 @@ fun box(): String { ) { case("val", "val $KEYWORD_MARKER", "", testNotRenamedByName) case("var", "var $KEYWORD_MARKER", "", testNotRenamedByName) - case("param", "$KEYWORD_MARKER", "",testRenamedByName) + case("param", "$KEYWORD_MARKER", "", testRenamedByName, ignore = true) } // ------------------------- @@ -228,6 +228,7 @@ class Case( val testDeclaration: String, val testDeclarationInit: String, val testBlock: String, + val ignore: Boolean, val additionalShouldBeEscaped: Set ) @@ -240,8 +241,9 @@ class Suite( class CaseBuilder { val cases = arrayListOf() - fun case(name: String, testDeclaration: String, testDeclarationInit: String, testBlock: String, additionalShouldBeEscaped: Set = setOf()) { - cases.add(Case(name, testDeclaration, testDeclarationInit, testBlock, additionalShouldBeEscaped)) + fun case(name: String, testDeclaration: String, testDeclarationInit: String, testBlock: String, + ignore: Boolean = false, additionalShouldBeEscaped: Set = setOf()) { + cases.add(Case(name, testDeclaration, testDeclarationInit, testBlock, ignore, additionalShouldBeEscaped)) } } @@ -291,6 +293,11 @@ class TestDataBuilder() { // Uses small portions of keywords instead of ALL_KEYWORDS to avoid a combinatorial explosion // Each portion contains at least one keyword which should be escaped and at least one which should not. for (keyword in nextKeywordPortion()) { + + if (case.ignore) { + continue + } + val shouldBeEscaped = keyword in SHOULD_BE_ESCAPED || keyword in case.additionalShouldBeEscaped val keywordWithEscapeIfNeed = if (shouldBeEscaped) "`$keyword`" else keyword diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java index 7050e01eb40..907d84c9bc1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java @@ -35,30 +35,6 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reservedWords/cases"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("dataClassParamElse.kt") - public void testDataClassParamElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassParamElse.kt"); - doTest(fileName); - } - - @TestMetadata("dataClassParamFalse.kt") - public void testDataClassParamFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassParamFalse.kt"); - doTest(fileName); - } - - @TestMetadata("dataClassParamInfinity.kt") - public void testDataClassParamInfinity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassParamInfinity.kt"); - doTest(fileName); - } - - @TestMetadata("dataClassParamKotlin.kt") - public void testDataClassParamKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassParamKotlin.kt"); - doTest(fileName); - } - @TestMetadata("dataClassValBreak.kt") public void testDataClassValBreak() throws Exception { String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValBreak.kt"); diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamElse.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamElse.kt deleted file mode 100644 index b2ce8fd9c9e..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamElse.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -data class DataClass(`else`: String) { - init { - testRenamed("else", { `else` }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamFalse.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamFalse.kt deleted file mode 100644 index 37be2113488..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamFalse.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -data class DataClass(`false`: String) { - init { - testRenamed("false", { `false` }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamInfinity.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamInfinity.kt deleted file mode 100644 index 2d5b90f7fbf..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamInfinity.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -data class DataClass(Infinity: String) { - init { - testRenamed("Infinity", { Infinity }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamKotlin.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamKotlin.kt deleted file mode 100644 index 1e2c44de202..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamKotlin.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -data class DataClass(Kotlin: String) { - init { - testRenamed("Kotlin", { Kotlin }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file