MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix guava inspection tests

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-04-03 16:27:25 +03:00
parent 0981a23d63
commit 2aebcfd15b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java
+2 -1
View File
@@ -268,6 +268,7 @@ public class GuavaInspection extends BaseJavaLocalInspectionTool {
}
public class MigrateGuavaTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement implements BatchQuickFix<CommonProblemDescriptor> {
public static final String FAMILY_NAME = "Migrate Guava's type to Java";
private final PsiType myTargetType;
private MigrateGuavaTypeFix(@NotNull PsiElement element, PsiType targetType) {
@@ -310,7 +311,7 @@ public class GuavaInspection extends BaseJavaLocalInspectionTool {
@NotNull
@Override
public String getFamilyName() {
return "Migrate Guava's type to Java";
return FAMILY_NAME;
}
@Override
java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
+2 -4
View File
@@ -18,7 +18,6 @@ package com.intellij.codeInsight.inspections;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.actions.CleanupInspectionIntention;
import com.intellij.idea.Bombed;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.util.Pair;
@@ -34,7 +33,6 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import org.junit.Assert;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
/**
@@ -304,7 +302,7 @@ public class GuavaInspectionTest extends JavaCodeInsightFixtureTestCase {
myFixture.doHighlighting();
for (IntentionAction action : myFixture.getAvailableIntentions()) {
if (action instanceof GuavaInspection.MigrateGuavaTypeFix) {
if (GuavaInspection.MigrateGuavaTypeFix.FAMILY_NAME.equals(action.getFamilyName())) {
final PsiElement element = ((GuavaInspection.MigrateGuavaTypeFix)action).getStartElement();
if (PsiTreeUtil.instanceOf(element, highlightedElements)) {
fail("Quick fix is found but not expected for types " + Arrays.toString(highlightedElements));
@@ -319,7 +317,7 @@ public class GuavaInspectionTest extends JavaCodeInsightFixtureTestCase {
boolean actionFound = false;
myFixture.doHighlighting();
for (IntentionAction action : myFixture.getAvailableIntentions()) {
if (action instanceof GuavaInspection.MigrateGuavaTypeFix) {
if (GuavaInspection.MigrateGuavaTypeFix.FAMILY_NAME.equals(action.getFamilyName())) {
myFixture.launchAction(action);
actionFound = true;
break;