diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java index 1bf67b33115c..4bb90d246e29 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java @@ -1286,7 +1286,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase { List actions = ShowIntentionsPass.getAvailableFixes(editor, getFile(), -1, ((EditorEx)editor).getExpectedCaretOffset()); final HighlightInfo.IntentionActionDescriptor descriptor = assertOneElement(actions); - CodeInsightTestFixtureImpl.invokeIntention(descriptor.getAction(), getFile(), getEditor(), ""); + CodeInsightTestFixtureImpl.invokeIntention(descriptor.getAction(), getFile(), getEditor()); highlightErrors(); assertEmpty(ShowIntentionsPass.getAvailableFixes(editor, getFile(), -1, ((EditorEx)editor).getExpectedCaretOffset())); diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java index 7df0e79d795d..8e398a092782 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java @@ -346,7 +346,7 @@ public abstract class DaemonAnalyzerTestCase extends JavaCodeInsightTestCase { "'.\nAvailable actions: [" +StringUtil.join(ContainerUtil.map(actions, c -> c.getText()), ", ")+ "]\n" + "HighlightInfos: [" +StringUtil.join(infos, ", ")+"]"); } - CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor, intentionActionName); + CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor); } @Nullable diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java index 41f6336b7066..42f37c266a50 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java @@ -142,7 +142,7 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase } protected void invoke(@NotNull IntentionAction action) throws IncorrectOperationException { - CodeInsightTestFixtureImpl.invokeIntention(action, getFile(), getEditor(), action.getText()); + CodeInsightTestFixtureImpl.invokeIntention(action, getFile(), getEditor()); } protected IntentionAction findActionAndCheck(@NotNull ActionHint hint, String testFullPath) { diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index dd094407a561..7acf00fa893f 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -683,7 +683,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig @Override public void launchAction(@NotNull final IntentionAction action) { - EdtTestUtil.runInEdtAndWait(() -> invokeIntention(action, getHostFileAtCaret(), getHostEditor(), action.getText())); + EdtTestUtil.runInEdtAndWait(() -> invokeIntention(action, getHostFileAtCaret(), getHostEditor())); } @Override @@ -1925,7 +1925,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig } } - public static boolean invokeIntention(@NotNull IntentionAction action, PsiFile file, Editor editor, String actionText) { + public static boolean invokeIntention(@NotNull IntentionAction action, PsiFile file, Editor editor) { // Test that action will automatically clear the read-only attribute if modification is necessary. // If your test fails due to this, make sure that your quick-fix/intention // overrides "getElementToMakeWritable" or has the following line: @@ -1938,7 +1938,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig try { ApplicationManager.getApplication().invokeLater(() -> { try { - result.set(ShowIntentionActionsHandler.chooseActionAndInvoke(file, editor, action, actionText)); + result.set(ShowIntentionActionsHandler.chooseActionAndInvoke(file, editor, action, action.getText())); } catch (StubTextInconsistencyException e) { PsiTestUtil.compareStubTexts(e); diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java index 6694bab5ac22..f00b35e9d464 100644 --- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java +++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java @@ -118,7 +118,7 @@ public class InvokeIntention extends ActionOnFile { String textBefore = changedDocument == null ? null : changedDocument.getText(); Long stampBefore = changedDocument == null ? null : changedDocument.getModificationStamp(); - Runnable r = () -> CodeInsightTestFixtureImpl.invokeIntention(intention, file, editor, intention.getText()); + Runnable r = () -> CodeInsightTestFixtureImpl.invokeIntention(intention, file, editor); Disposable disposable = Disposer.newDisposable(); try { diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java index 27233760b0f0..3f678e458dec 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java @@ -86,7 +86,7 @@ public class JavaFxFieldToPropertyTest extends DaemonAnalyzerTestCase { Editor editor = getEditor(); PsiFile file = getFile(); - assertTrue(CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor, actionName)); + assertTrue(CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor)); checkResultByFile(getTestName(false) + "_after.java"); } diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java index 80c54308a802..8d2f14acb08a 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java @@ -64,8 +64,7 @@ public class JavaFXCollapseSubtagToAttributeTest extends DaemonAnalyzerTestCase if (available) { assertNotNull("Collapse tag '" + tagName + "' to attribute", intentionAction); - assertTrue(CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor, - "Collapse tag '" + tagName + "' to attribute")); + assertTrue(CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor)); checkResultByFile(getTestName(true) + "_after.fxml"); } else { assertNull(intentionAction); diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java index ac53f03a6591..81de0a096fd0 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java @@ -65,7 +65,7 @@ public class JavaFXExpandAttributeTest extends DaemonAnalyzerTestCase { if (available) { assertNotNull(actionName, intentionAction); - assertTrue(CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor, actionName)); + assertTrue(CodeInsightTestFixtureImpl.invokeIntention(intentionAction, file, editor)); checkResultByFile(getTestName(true) + "_after.fxml"); } else { assertNull(intentionAction);