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

Rename in test infra: hasFail() -> hasFailure()

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-09-28 15:36:51 +02:00
committed by teamcity
parent 591992dc12
commit d9934cd01a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/AbstractFailingTestSuppressor.kt
+2 -2
View File
@@ -14,13 +14,13 @@ abstract class AbstractFailingTestSuppressor(testServices: TestServices) : After
protected abstract fun testFile(): File
protected abstract fun hasFail(failedAssertions: List<WrappedException>): Boolean
protected abstract fun hasFailure(failedAssertions: List<WrappedException>): Boolean
override fun suppressIfNeeded(failedAssertions: List<WrappedException>): List<WrappedException> {
val failFile = testFile().parentFile.resolve("${testFile().nameWithoutExtension}.fail").takeIf { it.exists() }
?: return failedAssertions
val failReason = failFile.readText().trim()
if (hasFail(failedAssertions) || failReason == INCONSISTENT_DIAGNOSTICS) return emptyList()
if (hasFailure(failedAssertions) || failReason == INCONSISTENT_DIAGNOSTICS) return emptyList()
return failedAssertions + AssertionError("Fail file exists but no exception was thrown. Please remove ${failFile.name}").wrap()
}
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFailingTestSuppressor.kt
+1 -1
View File
@@ -18,7 +18,7 @@ class ClassicFrontendFailingTestSuppressor(testServices: TestServices) : Abstrac
return testServices.moduleStructure.originalTestDataFiles.first()
}
override fun hasFail(failedAssertions: List<WrappedException>): Boolean {
override fun hasFailure(failedAssertions: List<WrappedException>): Boolean {
return failedAssertions.any {
when (it) {
is WrappedException.FromFacade -> it.facade is ClassicFrontendFacade
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFailingTestSuppressor.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class FirFailingTestSuppressor(testServices: TestServices) : AbstractFailingTest
return testServices.moduleStructure.originalTestDataFiles.first().firTestDataFile
}
override fun hasFail(failedAssertions: List<WrappedException>): Boolean {
override fun hasFailure(failedAssertions: List<WrappedException>): Boolean {
return failedAssertions.any {
when (it) {
is WrappedException.FromFacade -> it.facade is FirFrontendFacade