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

[Tests] Update test data after changes to FIR diagnostic messages

Browse Source
This commit is contained in:
Kirill Rakhman
2023-08-11 11:00:37 +02:00
committed by Space Team
parent de1c92a32f
commit d0cc86f52c
101 changed files with 675 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/EnumEntriesWithOutdatedStdlibTest.kt
+2 -2
View File
@@ -27,8 +27,8 @@ class EnumEntriesWithOutdatedStdlibTest : KGPBaseTest() {
buildGradleKts.replaceText("\"1.9\" // <language-version>", "\"2.0\" // <language-version>")
buildAndFail(":compileKotlin") {
assertOutputContains("Main.kt:13:20 Unresolved reference: entries")
assertOutputContains("Main.kt:14:30 Unresolved reference: entries")
assertOutputContains("Main.kt:13:20 Unresolved reference 'entries'.")
assertOutputContains("Main.kt:14:30 Unresolved reference 'entries'.")
}
}
}
libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt
+7 -2
View File
@@ -72,7 +72,7 @@ class MainKtsTest {
val resErr = evalFile(File("$TEST_DATA_ROOT/resolve-error-hamcrest-via-junit.main.kts"))
Assert.assertTrue(
resErr is ResultWithDiagnostics.Failure &&
resErr.reports.any { it.message == "Unresolved reference: hamcrest" }
resErr.reports.any { it.message.contains("Unresolved reference") && it.message.contains("hamcrest") }
)
}
@@ -299,10 +299,15 @@ class MainKtsTest {
"test failed - expecting a failure$expected but received " +
(if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
":\n ${reports.joinToString("\n ")}",
res is ResultWithDiagnostics.Failure && reports.any { report -> expectedErrors.any { report.contains(it) } }
res is ResultWithDiagnostics.Failure && reports.any { report -> expectedErrors.any { report.containsIgnoringPunctuation(it) } }
)
}
private val regexNonWord = "\\W".toRegex()
private fun String.containsIgnoringPunctuation(it: String): Boolean {
return this.replace(regexNonWord, "").contains(it.replace(regexNonWord, ""))
}
private fun evalSuccessWithOut(scriptFile: File, cacheDir: File? = null): List<String> =
captureOut {
val res = evalFile(scriptFile, cacheDir)
libraries/tools/kotlin-maven-plugin-test/src/it/test-customJdk/verify.bsh
+6 -1
View File
@@ -5,12 +5,17 @@ assertBuildLogHasNoLineThatContains("AutoCloseable");
int line1 = findBuildLogLineThatContains("Unresolved reference: stream");
int line2 = findBuildLogLineThatContains("Unresolved reference: java.util.stream.Stream");
int line1K2 = findBuildLogLineThatContains("Unresolved reference 'stream'");
int line2K2 = findBuildLogLineThatContains("Unresolved reference 'java.util.stream.Stream'");
if (line1 >= 0) {
print("Expected content \"Unresolved reference: stream\" was found at line " + (line1+1) + " of build log: \"" + buildLog[line1] + "\"");
} else if (line2 >= 0) {
print("Expected content \"Unresolved reference: java.util.stream.Stream\" was found at line " + (line2+1) + " of build log: \"" + buildLog[line2] + "\"");
} else if (line1K2 >= 0) {
print("Expected content \"Unresolved reference 'stream'\" was found at line " + (line1K2+1) + " of build log: \"" + buildLog[line1K2] + "\"");
} else if (line2K2 >= 0) {
print("Expected content \"Unresolved reference 'java.util.stream.Stream'\" was found at line " + (line2K2+1) + " of build log: \"" + buildLog[line2K2] + "\"");
} else {
throw new Exception("Expected build log to contain: \"Unresolved reference: stream\" or \"Unresolved reference: java.util.stream.Stream\"");
}