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

Make IgnoreTests fail correctly when directive is outdated

Browse Source 
`Outdated` means green test with `IGNORE_FIR` directive, or
red test with `FIR_COMPARISON` directive

Also, invoke directive insertion only when it is appropriate
This commit is contained in:
Roman Golyshev
2021-05-11 18:25:55 +03:00
committed by Space
parent 22db894076
commit 03a1439cc0
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
+18 -7
View File
@@ -97,7 +97,7 @@ object IgnoreTests {
} catch (e: Throwable) { } catch (e: Throwable) {
if (testIsEnabled) { if (testIsEnabled) {
if (directive is EnableOrDisableTestDirective.Disable) { if (directive is EnableOrDisableTestDirective.Disable) {
handleTestWithWrongDirective(testFile, directive, directivePosition, additionalFiles) handleTestWithWrongDirective(testPasses = false, testFile, directive, directivePosition, additionalFiles)
} }
throw e throw e
} }
@@ -105,23 +105,33 @@ object IgnoreTests {
} }
if (!testIsEnabled) { if (!testIsEnabled) {
handleTestWithWrongDirective(testFile, directive, directivePosition, additionalFiles) handleTestWithWrongDirective(testPasses = true, testFile, directive, directivePosition, additionalFiles)
} }
} }
@OptIn(ExperimentalStdlibApi::class) @OptIn(ExperimentalStdlibApi::class)
private fun handleTestWithWrongDirective( private fun handleTestWithWrongDirective(
testPasses: Boolean,
testFile: Path, testFile: Path,
directive: EnableOrDisableTestDirective, directive: EnableOrDisableTestDirective,
directivePosition: DirectivePosition, directivePosition: DirectivePosition,
additionalFiles: List<Path>, additionalFiles: List<Path>,
) { ) {
val verb = when (directive) { val verb = when (testPasses) {
is EnableOrDisableTestDirective.Disable -> "do not pass" false -> "do not pass"
is EnableOrDisableTestDirective.Enable -> "passes" true -> "passes"
} }
if (INSERT_DIRECTIVE_AUTOMATICALLY) {
val directiveIsOutdated = when {
!testPasses && directive is EnableOrDisableTestDirective.Enable -> true
testPasses && directive is EnableOrDisableTestDirective.Disable -> true
else -> false
}
val directiveIsMissing = !directiveIsOutdated
if (directiveIsMissing && INSERT_DIRECTIVE_AUTOMATICALLY) {
testFile.insertDirectivesToFileAndAdditionalFile(directive, additionalFiles, directivePosition) testFile.insertDirectivesToFileAndAdditionalFile(directive, additionalFiles, directivePosition)
val filesWithDirectiveAdded = buildList { val filesWithDirectiveAdded = buildList {
add(testFile.fileName.toString()) add(testFile.fileName.toString())
@@ -131,7 +141,8 @@ object IgnoreTests {
"Looks like the test $verb, ${directive.directiveText} was added to the ${filesWithDirectiveAdded.joinToString()}" "Looks like the test $verb, ${directive.directiveText} was added to the ${filesWithDirectiveAdded.joinToString()}"
) )
} }
if (directive is EnableOrDisableTestDirective.Enable) {
if (directiveIsOutdated) {
throw AssertionError( throw AssertionError(
"Looks like the test $verb, please ${directive.fixDirectiveMessage} the ${testFile.fileName}" "Looks like the test $verb, please ${directive.fixDirectiveMessage} the ${testFile.fileName}"
) )