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

IR test tests: use that magical '<<<' everywhere. No need for 'IR_FILE_TXT'.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-08-12 10:52:58 +03:00
committed by Dmitry Petrov
parent 4ccf3c3590
commit b1af1af8a4
7 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
+2 -13
View File
@@ -41,10 +41,6 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
val expectations = parseExpectations(dir, testFile)
val irFileDump = irFile.dump()
expectations.irExpectedTextFile?.let { expectFile ->
KotlinTestUtils.assertEqualsToFile(expectFile, irFileDump)
}
val expected = StringBuilder()
val actual = StringBuilder()
for (expectation in expectations.regexps) {
@@ -67,7 +63,7 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
}
}
internal class Expectations(val irExpectedTextFile: File?, val regexps: List<RegexpInText>, val irTreeFileLabels: List<IrTreeFileLabel>)
internal class Expectations(val regexps: List<RegexpInText>, val irTreeFileLabels: List<IrTreeFileLabel>)
internal class RegexpInText(val numberOfOccurrences: Int, val needle: String) {
constructor(countStr: String, needle: String) : this(Integer.valueOf(countStr), needle)
@@ -77,11 +73,9 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
companion object {
private val EXPECTED_OCCURRENCES_PATTERN = Regex("""^\s*//\s*(\d+)\s*(.*)$""")
private val IR_FILE_TXT_PATTERN = Regex("""^\s*//\s*IR_FILE_TXT\s+(.*)$""")
private val IR_TREES_TXT_PATTERN = Regex("""// \s*<<<\s+(.*)$""")
internal fun parseExpectations(dir: File, testFile: TestFile): Expectations {
var expectedTextFileName: String? = null
val regexps = ArrayList<RegexpInText>()
val treeFiles = ArrayList<IrTreeFileLabel>()
@@ -89,9 +83,6 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
EXPECTED_OCCURRENCES_PATTERN.matchEntire(line)?.let { matchResult ->
regexps.add(RegexpInText(matchResult.groupValues[1], matchResult.groupValues[2].trim()))
}
?: IR_FILE_TXT_PATTERN.matchEntire(line)?.let { matchResult ->
expectedTextFileName = matchResult.groupValues[1].trim()
}
?: IR_TREES_TXT_PATTERN.find(line)?.let { matchResult ->
val fileName = matchResult.groupValues[1].trim()
val file = createExpectedTextFile(testFile, dir, fileName)
@@ -99,9 +90,7 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
}
}
val expectedTextFile: File? = expectedTextFileName?.let { createExpectedTextFile(testFile, dir, it) }
return Expectations(expectedTextFile, regexps, treeFiles)
return Expectations(regexps, treeFiles)
}
internal fun createExpectedTextFile(testFile: TestFile, dir: File, fileName: String): File {