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

AbstractQuickFixMultiModuleTest: support multiline errors SHOULD_FAIL_WITH

Browse Source
This commit is contained in:
Dmitry Gridin
2019-08-19 19:27:35 +07:00
parent 3f7c983f04
commit 1b718761b2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt
+4 -3
View File
@@ -44,14 +44,15 @@ abstract class AbstractQuickFixMultiModuleTest : AbstractMultiModuleTest(), Quic
enableInspectionTools(*inspections) enableInspectionTools(*inspections)
CommandProcessor.getInstance().executeCommand(project, { CommandProcessor.getInstance().executeCommand(project, {
var expectedErrorMessage: String = "" var expectedErrorMessage = ""
try { try {
val actionHint = ActionHint.parse(actionFile, actionFileText) val actionHint = ActionHint.parse(actionFile, actionFileText)
val text = actionHint.expectedText val text = actionHint.expectedText
val actionShouldBeAvailable = actionHint.shouldPresent() val actionShouldBeAvailable = actionHint.shouldPresent()
expectedErrorMessage = InTextDirectivesUtils.findStringWithPrefixes(actionFileText, "// SHOULD_FAIL_WITH: ") ?: "" expectedErrorMessage = InTextDirectivesUtils.findListWithPrefixes(actionFileText, "// SHOULD_FAIL_WITH: ")
.joinToString(separator = "\n")
AbstractQuickFixMultiFileTest.doAction( AbstractQuickFixMultiFileTest.doAction(
text, file, editor, actionShouldBeAvailable, actionFileName, this::availableActions, this::doHighlighting, text, file, editor, actionShouldBeAvailable, actionFileName, this::availableActions, this::doHighlighting,
@@ -87,7 +88,7 @@ abstract class AbstractQuickFixMultiModuleTest : AbstractMultiModuleTest(), Quic
for (editedFile in project.allKotlinFiles()) { for (editedFile in project.allKotlinFiles()) {
val afterFileInTmpProject = editedFile.containingDirectory?.findFile(editedFile.name + ".after") ?: continue val afterFileInTmpProject = editedFile.containingDirectory?.findFile(editedFile.name + ".after") ?: continue
val afterFileInTestData = afterFiles.filter { it.name == afterFileInTmpProject.name } .single { val afterFileInTestData = afterFiles.filter { it.name == afterFileInTmpProject.name }.single {
it.readText() == File(afterFileInTmpProject.virtualFile.path).readText() it.readText() == File(afterFileInTmpProject.virtualFile.path).readText()
} }