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

Scripting: fix CLI REPL error reporting behavior

Browse Source 
discrepancy after switching to the new REPL internals was
discovered also on IJ plugin tests, so added a test emulating it.
also some test infra refactoring
This commit is contained in:
Ilya Chernikov
2022-06-27 14:01:46 +02:00
parent 8bc43917ec
commit 6e59c2e079
5 changed files with 80 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cli/LauncherReplTest.kt
+51 -9
View File
@@ -49,12 +49,12 @@ class LauncherReplTest : TestCaseWithTmpdir() {
val out = ArrayList<String>()
val exceptionContainer = ExceptionContainer()
val thread = thread {
val promptRegex = Regex("(?:\\u001B\\p{Graph}+)*(?:>>>|\\.\\.\\.)")
val promptRegex = Regex("(?:\\u001B\\p{Graph}+)*(?:>>> ?|\\.\\.\\.)")
try {
reader().forEachLine { rawLine ->
promptRegex.split(rawLine).forEach { line ->
if (line.isNotEmpty()) {
out.add(line.trim())
out.add(line.trimEnd())
}
}
}
@@ -137,13 +137,24 @@ class LauncherReplTest : TestCaseWithTmpdir() {
Assert.fail("missing output for expected patterns:\n${inputsToExpectedOutputsIter.asSequence().joinToString("\n") { it.second } }")
}
if (!inputsToExpectedOutputsIter.hasNext() || !actualIter.hasNext()) break
val (input, expectedPattern) = inputsToExpectedOutputsIter.next()
val actualLine = actualIter.next()
val strippedActualLine = if (input != null) actualLine.removePrefix(input) else actualLine
assertTrue(
"line \"$strippedActualLine\" do not match with expected pattern \"$expectedPattern\"",
Regex(expectedPattern).matches(strippedActualLine)
)
var (input, expectedPattern) = inputsToExpectedOutputsIter.next()
var actualLine = actualIter.next()
while (input != null) {
if (actualLine.startsWith(input)) {
actualLine = actualLine.substring(input.length)
} else if (expectedPattern.isEmpty() && actualLine.isNotEmpty() && inputsToExpectedOutputsIter.hasNext()) {
// assuming that on some configs input is not repeated if producing empty output
// in this case trying to check the next expected output
val nextInputToOutput = inputsToExpectedOutputsIter.next()
expectedPattern = nextInputToOutput.second
input = nextInputToOutput.first
continue
}
break
}
if (!Regex(expectedPattern).matches(actualLine)) {
fail("line \"$actualLine\" do not match with expected pattern \"$expectedPattern\"")
}
}
}
@@ -159,6 +170,37 @@ class LauncherReplTest : TestCaseWithTmpdir() {
)
}
fun testSReplWithMultipleErrors() {
runInteractive(
*replOutHeader,
"\$;\$;" to ".*expecting an element",
null to "\\\$;\\\$;",
null to "\\^",
null to ".*expecting an element",
null to "\\\$;\\\$;",
null to " \\^",
"println(\$);println(\$);" to ".*expecting an expression",
null to "println\\(\\\$\\);println\\(\\\$\\);",
null to " \\^",
null to ".*expecting '\\)'",
null to "println\\(\\\$\\);println\\(\\\$\\);",
null to " \\^",
null to ".*expecting an element",
null to "println\\(\\\$\\);println\\(\\\$\\);",
null to " \\^",
null to ".*expecting an expression",
null to "println\\(\\\$\\);println\\(\\\$\\);",
null to " \\^",
null to ".*expecting '\\)'",
null to "println\\(\\\$\\);println\\(\\\$\\);",
null to " \\^",
null to ".*expecting an element",
null to "println\\(\\\$\\);println\\(\\\$\\);",
null to " \\^",
"println(42)" to "42",
)
}
fun testReplResultFormatting() {
runInteractive(
*replOutHeader,