From d9934cd01a1a7419897de22233ee8e1ac7342f3c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 28 Sep 2022 15:36:51 +0200 Subject: [PATCH] Rename in test infra: hasFail() -> hasFailure() --- .../kotlin/test/frontend/AbstractFailingTestSuppressor.kt | 4 ++-- .../frontend/classic/ClassicFrontendFailingTestSuppressor.kt | 2 +- .../kotlin/test/frontend/fir/FirFailingTestSuppressor.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/AbstractFailingTestSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/AbstractFailingTestSuppressor.kt index 1e95bdc4e00..befdb63b91a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/AbstractFailingTestSuppressor.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/AbstractFailingTestSuppressor.kt @@ -14,13 +14,13 @@ abstract class AbstractFailingTestSuppressor(testServices: TestServices) : After protected abstract fun testFile(): File - protected abstract fun hasFail(failedAssertions: List): Boolean + protected abstract fun hasFailure(failedAssertions: List): Boolean override fun suppressIfNeeded(failedAssertions: List): List { 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() } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFailingTestSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFailingTestSuppressor.kt index e11b41dab94..2376ae8ab6c 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFailingTestSuppressor.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFailingTestSuppressor.kt @@ -18,7 +18,7 @@ class ClassicFrontendFailingTestSuppressor(testServices: TestServices) : Abstrac return testServices.moduleStructure.originalTestDataFiles.first() } - override fun hasFail(failedAssertions: List): Boolean { + override fun hasFailure(failedAssertions: List): Boolean { return failedAssertions.any { when (it) { is WrappedException.FromFacade -> it.facade is ClassicFrontendFacade diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFailingTestSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFailingTestSuppressor.kt index 82d94b44932..81f95bfcdbd 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFailingTestSuppressor.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFailingTestSuppressor.kt @@ -19,7 +19,7 @@ class FirFailingTestSuppressor(testServices: TestServices) : AbstractFailingTest return testServices.moduleStructure.originalTestDataFiles.first().firTestDataFile } - override fun hasFail(failedAssertions: List): Boolean { + override fun hasFailure(failedAssertions: List): Boolean { return failedAssertions.any { when (it) { is WrappedException.FromFacade -> it.facade is FirFrontendFacade