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

Regenerate tests for JS reserved words when cases changed

Browse Source
This commit is contained in:
Zalim Bashorov
2015-09-18 19:26:36 +03:00
committed by Dmitry Jemerov
parent 4ca434da54
commit a1979b6eb4
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt
+9 -3
View File
@@ -261,13 +261,17 @@ class TestDataBuilder() {
val testDataDir = File(testDataDirPath) val testDataDir = File(testDataDirPath)
val cases = suites.flatMap { suite -> suite.cases.map { case -> suite.name + " / " + case.name } }.sorted()
val shouldBeEscapedFile = File("$testDataDirPath/SHOULD_BE_ESCAPED.txt") val shouldBeEscapedFile = File("$testDataDirPath/SHOULD_BE_ESCAPED.txt")
val shouldNotBeEscapedFile = File("$testDataDirPath/SHOULD_NOT_BE_ESCAPED.txt") val shouldNotBeEscapedFile = File("$testDataDirPath/SHOULD_NOT_BE_ESCAPED.txt")
val casesFile = File("$testDataDirPath/CASES.txt")
val shouldBeEscapedFromFile = shouldBeEscapedFile.readLinesOrNull()?.drop(1) val shouldBeEscapedFromFile = shouldBeEscapedFile.readLinesOrNull()?.drop(1)
val shouldNotBeEscapedFromFile = shouldNotBeEscapedFile.readLinesOrNull()?.drop(1) val shouldNotBeEscapedFromFile = shouldNotBeEscapedFile.readLinesOrNull()?.drop(1)
val casesFromFile = casesFile.readLinesOrNull()?.drop(1)
val isCreatingFromScratch = shouldBeEscapedFromFile != SHOULD_BE_ESCAPED || shouldNotBeEscapedFromFile != SHOULD_NOT_BE_ESCAPED val isCreatingFromScratch = shouldBeEscapedFromFile != SHOULD_BE_ESCAPED || shouldNotBeEscapedFromFile != SHOULD_NOT_BE_ESCAPED || casesFromFile != cases
if (!testDataDir.exists() && !testDataDir.mkdirs()) { if (!testDataDir.exists() && !testDataDir.mkdirs()) {
error("Unable to find or create test data directory: '$testDataDirPath'.") error("Unable to find or create test data directory: '$testDataDirPath'.")
@@ -320,6 +324,8 @@ class TestDataBuilder() {
if (isCreatingFromScratch) { if (isCreatingFromScratch) {
shouldBeEscapedFile.writeText("$PREAMBLE_MESSAGE\n${SHOULD_BE_ESCAPED.join("\n")}") shouldBeEscapedFile.writeText("$PREAMBLE_MESSAGE\n${SHOULD_BE_ESCAPED.join("\n")}")
shouldNotBeEscapedFile.writeText("$PREAMBLE_MESSAGE\n${SHOULD_NOT_BE_ESCAPED.join("\n")}") shouldNotBeEscapedFile.writeText("$PREAMBLE_MESSAGE\n${SHOULD_NOT_BE_ESCAPED.join("\n")}")
casesFile.writeText("$PREAMBLE_MESSAGE\n${cases.join("\n")}")
} }
} }
} }
@@ -353,8 +359,8 @@ val testNotRenamedByRef = testNotRenamed("::$KEYWORD_MARKER")
// KEYWORDS // KEYWORDS
val SHOULD_BE_ESCAPED = JsFunctionScope.RESERVED_WORDS.filter { it in KeywordStringsGenerated.KEYWORDS }.toSortedList() val SHOULD_BE_ESCAPED = JsFunctionScope.RESERVED_WORDS.filter { it in KeywordStringsGenerated.KEYWORDS }.sorted()
val SHOULD_NOT_BE_ESCAPED = JsFunctionScope.RESERVED_WORDS.filter { it !in SHOULD_BE_ESCAPED }.toSortedList() val SHOULD_NOT_BE_ESCAPED = JsFunctionScope.RESERVED_WORDS.filter { it !in SHOULD_BE_ESCAPED }.sorted()
// all keywords by portions // all keywords by portions
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
-1
View File
@@ -1158,7 +1158,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
doTestWithExtraFile(fileName); doTestWithExtraFile(fileName);
} }
} }
} }
@TestMetadata("idea/testData/quickfix/modifiers") @TestMetadata("idea/testData/quickfix/modifiers")
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
-15
View File
@@ -4225,21 +4225,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName); doTest(fileName);
} }
} }
@TestMetadata("idea/testData/quickfix/migration/traitToInterface")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TraitToInterface extends AbstractQuickFixTest {
public void testAllFilesPresentInTraitToInterface() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/traitToInterface"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("traitToInterface.kt")
public void testTraitToInterface() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/traitToInterface/traitToInterface.kt");
doTest(fileName);
}
}
} }
@TestMetadata("idea/testData/quickfix/modifiers") @TestMetadata("idea/testData/quickfix/modifiers")