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

Prepare spec tests for FIR version

Browse Source
This commit is contained in:
Denis Zharkov
2020-04-14 11:49:36 +03:00
parent 13efabc764
commit 26cb0ba144
4 changed files with 318 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java
Generated
+308 -308
View File
File diff suppressed because it is too large Load Diff
compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapGenerator.kt
+1 -1
View File
@@ -51,7 +51,7 @@ object TestsJsonMapGenerator {
TestArea.values().forEach { testArea -> TestArea.values().forEach { testArea ->
File("${GeneralConfiguration.SPEC_TESTDATA_PATH}/${testArea.testDataPath}/$LINKED_TESTS_PATH").walkTopDown() File("${GeneralConfiguration.SPEC_TESTDATA_PATH}/${testArea.testDataPath}/$LINKED_TESTS_PATH").walkTopDown()
.forEach testFiles@{ file -> .forEach testFiles@{ file ->
if (!file.isFile || file.extension != "kt") return@testFiles if (!file.isFile || file.extension != "kt" || file.name.endsWith(".fir.kt")) return@testFiles
val (specTest, _) = CommonParser.parseSpecTest(file.canonicalPath, mapOf("main.kt" to file.readText())) val (specTest, _) = CommonParser.parseSpecTest(file.canonicalPath, mapOf("main.kt" to file.readText()))
compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/Patterns.kt
+2 -2
View File
@@ -55,7 +55,7 @@ interface BasePatterns {
} }
object NotLinkedSpecTestPatterns : BasePatterns { object NotLinkedSpecTestPatterns : BasePatterns {
private const val FILENAME_REGEX = """(?<testNumber>$INTEGER_REGEX)\.kt""" private const val FILENAME_REGEX = """(?<testNumber>$INTEGER_REGEX)(?:\.fir)?\.kt"""
override val pathPartRegex = SpecTestLinkedType.NOT_LINKED.testDataPath + ps + sectionsInPathRegex override val pathPartRegex = SpecTestLinkedType.NOT_LINKED.testDataPath + ps + sectionsInPathRegex
override val testPathPattern: Pattern = override val testPathPattern: Pattern =
@@ -65,7 +65,7 @@ object NotLinkedSpecTestPatterns : BasePatterns {
} }
object LinkedSpecTestPatterns : BasePatterns { object LinkedSpecTestPatterns : BasePatterns {
private const val FILENAME_REGEX = """(?<sentenceNumber>$INTEGER_REGEX)\.(?<testNumber>$INTEGER_REGEX)\.kt""" private const val FILENAME_REGEX = """(?<sentenceNumber>$INTEGER_REGEX)\.(?<testNumber>$INTEGER_REGEX)(?:\.fir)?\.kt"""
override val pathPartRegex = override val pathPartRegex =
"""${SpecTestLinkedType.LINKED.testDataPath}$ps$sectionsInPathRegex${ps}p-(?<paragraphNumber>$INTEGER_REGEX)""" """${SpecTestLinkedType.LINKED.testDataPath}$ps$sectionsInPathRegex${ps}p-(?<paragraphNumber>$INTEGER_REGEX)"""
compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
+7 -1
View File
@@ -35,9 +35,15 @@ fun detectDirsWithTestsMapFileOnly(dirName: String): List<String> {
} }
fun generateTests() { fun generateTests() {
val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$"
testGroup(SPEC_TEST_PATH, SPEC_TESTDATA_PATH) { testGroup(SPEC_TEST_PATH, SPEC_TESTDATA_PATH) {
testClass<AbstractDiagnosticsTestSpec> { testClass<AbstractDiagnosticsTestSpec> {
model("diagnostics", excludeDirs = listOf("helpers") + detectDirsWithTestsMapFileOnly("diagnostics")) model(
"diagnostics",
excludeDirs = listOf("helpers") + detectDirsWithTestsMapFileOnly("diagnostics"),
excludedPattern = excludedFirTestdataPattern
)
} }
testClass<AbstractParsingTestSpec> { testClass<AbstractParsingTestSpec> {
model( model(