From b38ca21bacc60918808e6f40cab140356500cbcc Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 18 Oct 2016 17:52:31 +0200 Subject: [PATCH] assertEquals can be replaced with assertSame: introduce junit 5; extract common fix --- .../siyeh/InspectionGadgetsBundle.properties | 2 +- .../AssertEqualsCalledOnArrayInspection.java | 43 +---------- .../com/siyeh/ig/junit/AssertEqualsHint.java | 11 +-- ...AssertEqualsMayBeAssertSameInspection.java | 75 ++----------------- ...stClassNamingConventionInspectionBase.java | 2 +- .../siyeh/ig/junit/JUnitCommonClassNames.java | 1 + ...stClassNamingConventionInspectionBase.java | 2 +- .../MalformedSetUpTearDownInspection.java | 2 +- .../ig/junit/ReplaceAssertEqualsFix.java | 75 +++++++++++++++++++ .../SimplifiableJUnitAssertionInspection.java | 3 +- .../siyeh/ig/junit/StaticSuiteInspection.java | 2 +- .../SuperTearDownInFinallyInspection.java | 2 +- .../TestCaseWithNoTestMethodsInspection.java | 2 +- .../junit/UseOfObsoleteAssertInspection.java | 2 +- .../src/com/siyeh/ig/psiutils/TestUtils.java | 3 +- ...sertEqualsCalledOnArrayInspectionTest.java | 2 +- 16 files changed, 100 insertions(+), 129 deletions(-) create mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ReplaceAssertEqualsFix.java diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties index b64cefa9fabc..ff0227571fed 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties @@ -1791,7 +1791,7 @@ unnecessarily.qualified.statically.imported.element.display.name=Unnecessarily q unnecessarily.qualified.statically.imported.element.problem.descriptor=Statically imported element ''{0}'' is unnecessarily qualified with #ref #loc unnecessarily.qualified.statically.imported.element.quickfix=Remove unnecessary qualifier ignore.instanceof.on.library.classes=Ignore instanceof on library classes -assertequals.may.be.assertsame.quickfix=Replace with 'assertSame()' +replace.assertequals.quickfix=Replace with ''{0}'' for.can.be.foreach.option=Report indexed 'java.util.List' loops for.can.be.foreach.option2=Do not report iterations over untyped collections cast.conflicts.with.instanceof.quickfix1=Replace ''{0}'' with ''{1}'' in cast diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsCalledOnArrayInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsCalledOnArrayInspection.java index 92e7e6537b90..1aaed46c75ac 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsCalledOnArrayInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsCalledOnArrayInspection.java @@ -15,19 +15,12 @@ */ package com.siyeh.ig.junit; -import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.openapi.project.Project; import com.intellij.psi.*; -import com.intellij.psi.util.InheritanceUtil; -import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.ig.PsiReplacementUtil; -import com.siyeh.ig.psiutils.ImportUtils; import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; public class AssertEqualsCalledOnArrayInspection extends BaseInspection { @@ -47,39 +40,7 @@ public class AssertEqualsCalledOnArrayInspection extends BaseInspection { @Override protected InspectionGadgetsFix buildFix(Object... infos) { - return new AssertEqualsCalledOnArrayFix((String)infos[0]); - } - - private static class AssertEqualsCalledOnArrayFix extends InspectionGadgetsFix { - - private final String myAssertClassName; - - public AssertEqualsCalledOnArrayFix(String assertClassName) { - myAssertClassName = assertClassName; - } - - @Override - @NotNull - public String getFamilyName() { - return InspectionGadgetsBundle.message("assertequals.called.on.arrays.quickfix"); - } - - @Override - protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { - final PsiElement methodNameIdentifier = descriptor.getPsiElement(); - final PsiElement parent = methodNameIdentifier.getParent(); - if (!(parent instanceof PsiReferenceExpression)) { - return; - } - final PsiReferenceExpression methodExpression = (PsiReferenceExpression)parent; - final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (qualifier == null && ImportUtils.addStaticImport(myAssertClassName, "assertArrayEquals", methodExpression)) { - PsiReplacementUtil.replaceExpression(methodExpression, "assertArrayEquals"); - } - else { - PsiReplacementUtil.replaceExpression(methodExpression, myAssertClassName + ".assertArrayEquals"); - } - } + return new ReplaceAssertEqualsFix("assertArrayEquals"); } @Override @@ -104,7 +65,7 @@ public class AssertEqualsCalledOnArrayInspection extends BaseInspection { if (!(type1 instanceof PsiArrayType) || !(type2 instanceof PsiArrayType)) { return; } - registerMethodCallError(expression, assertEqualsHint.getAssertClassName()); + registerMethodCallError(expression); } } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsHint.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsHint.java index 2b326b80d647..3479e2f04e56 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsHint.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsHint.java @@ -25,16 +25,10 @@ import org.jetbrains.annotations.NonNls; public class AssertEqualsHint { private final int myArgIndex; private final PsiMethod myMethod; - private final String myClassName; - private AssertEqualsHint(int index, PsiMethod method, String className) { + private AssertEqualsHint(int index, PsiMethod method) { myArgIndex = index; myMethod = method; - myClassName = className; - } - - public String getAssertClassName() { - return myClassName; } public int getArgIndex() { @@ -60,6 +54,7 @@ public class AssertEqualsHint { InheritanceUtil.isInheritor(containingClass, "org.testng.Assert"); if (!InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT) && !InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.ORG_JUNIT_ASSERT) && + !InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE) && !InheritanceUtil.isInheritor(containingClass, "org.testng.AssertJUnit") && !messageOnLastPosition) { return null; @@ -85,7 +80,7 @@ public class AssertEqualsHint { } argumentIndex = 0; } - return new AssertEqualsHint(argumentIndex, method, messageOnLastPosition ? JUnitCommonClassNames.ORG_JUNIT_JUPITER_API_ASSERTIONS : JUnitCommonClassNames.ORG_JUNIT_ASSERT); + return new AssertEqualsHint(argumentIndex, method); } public static String areExpectedActualTypesCompatible(PsiMethodCallExpression expression) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java index 73dcba18d921..c0e46bc62a54 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java @@ -15,17 +15,11 @@ */ package com.siyeh.ig.junit; -import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.openapi.project.Project; import com.intellij.psi.*; -import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.ig.PsiReplacementUtil; -import com.siyeh.ig.psiutils.ImportUtils; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; public class AssertEqualsMayBeAssertSameInspection extends BaseInspection { @@ -44,50 +38,7 @@ public class AssertEqualsMayBeAssertSameInspection extends BaseInspection { @Override protected InspectionGadgetsFix buildFix(Object... infos) { - return new AssertEqualsMayBeAssertSameFix(); - } - - private static class AssertEqualsMayBeAssertSameFix extends InspectionGadgetsFix { - - @Override - @NotNull - public String getFamilyName() { - return InspectionGadgetsBundle.message("assertequals.may.be.assertsame.quickfix"); - } - - @Override - protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { - final PsiElement element = descriptor.getPsiElement(); - final PsiElement parent = element.getParent(); - if (!(parent instanceof PsiReferenceExpression)) { - return; - } - final PsiReferenceExpression methodExpression = (PsiReferenceExpression)parent; - final PsiElement grandParent = methodExpression.getParent(); - if (!(grandParent instanceof PsiMethodCallExpression)) { - return; - } - final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; - final PsiMethod method = methodCallExpression.resolveMethod(); - if (method == null) { - return; - } - final PsiClass containingClass = method.getContainingClass(); - if (containingClass == null) { - return; - } - final String className = containingClass.getQualifiedName(); - if (className == null) { - return; - } - final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (qualifier == null && ImportUtils.addStaticImport(className, "assertSame", methodExpression)) { - PsiReplacementUtil.replaceExpression(methodExpression, "assertSame"); - } - else { - PsiReplacementUtil.replaceExpression(methodExpression, className + ".assertSame"); - } - } + return new ReplaceAssertEqualsFix("assertSame"); } @Override @@ -100,9 +51,8 @@ public class AssertEqualsMayBeAssertSameInspection extends BaseInspection { @Override public void visitMethodCallExpression(PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); - final PsiReferenceExpression methodExpression = expression.getMethodExpression(); - @NonNls final String name = methodExpression.getReferenceName(); - if (!"assertEquals".equals(name)) { + final AssertEqualsHint assertEqualsHint = AssertEqualsHint.create(expression); + if (assertEqualsHint == null) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); @@ -110,25 +60,12 @@ public class AssertEqualsMayBeAssertSameInspection extends BaseInspection { if (arguments.length != 3 && arguments.length != 2) { return; } - final PsiMethod method = expression.resolveMethod(); - if (method == null) { - return; - } - final PsiClass aClass = method.getContainingClass(); - if (aClass == null) { - return; - } - final String qualifiedName = aClass.getQualifiedName(); - if (!JUnitCommonClassNames.ORG_JUNIT_ASSERT.equals(qualifiedName) && !JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT - .equals(qualifiedName) && - !"junit.framework.TestCase".equals(qualifiedName)) { - return; - } - final PsiExpression argument1 = arguments[arguments.length - 2]; + final int argIndex = assertEqualsHint.getArgIndex(); + final PsiExpression argument1 = arguments[argIndex]; if (!couldBeAssertSameArgument(argument1)) { return; } - final PsiExpression argument2 = arguments[arguments.length - 1]; + final PsiExpression argument2 = arguments[argIndex + 1]; if (!couldBeAssertSameArgument(argument2)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitAbstractTestClassNamingConventionInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitAbstractTestClassNamingConventionInspectionBase.java index 448d826409ef..a2512b6398ba 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitAbstractTestClassNamingConventionInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitAbstractTestClassNamingConventionInspectionBase.java @@ -83,7 +83,7 @@ public class JUnitAbstractTestClassNamingConventionInspectionBase extends Conven return; } if (!InheritanceUtil.isInheritor(aClass, - "junit.framework.TestCase")) { + JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE)) { return; } final String name = aClass.getName(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java index e4c9a211a2a0..66c3cf4f9560 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java @@ -19,4 +19,5 @@ public class JUnitCommonClassNames { public static final String ORG_JUNIT_ASSERT = "org.junit.Assert"; public static final String JUNIT_FRAMEWORK_ASSERT = "junit.framework.Assert"; public static final String ORG_JUNIT_JUPITER_API_ASSERTIONS = "org.junit.jupiter.api.Assertions"; + public static final String JUNIT_FRAMEWORK_TEST_CASE = "junit.framework.TestCase"; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitTestClassNamingConventionInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitTestClassNamingConventionInspectionBase.java index 3d7a04f7a53a..d44126fd027c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitTestClassNamingConventionInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitTestClassNamingConventionInspectionBase.java @@ -83,7 +83,7 @@ public class JUnitTestClassNamingConventionInspectionBase extends ConventionInsp return; } if (!InheritanceUtil.isInheritor(aClass, - "junit.framework.TestCase")) { + JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE)) { if (!hasJUnit4TestMethods(aClass)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java index e9701710d578..be5f036e43b7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java @@ -56,7 +56,7 @@ public class MalformedSetUpTearDownInspection extends BaseInspection { return; } final PsiClass targetClass = method.getContainingClass(); - if (!InheritanceUtil.isInheritor(targetClass, "junit.framework.TestCase")) { + if (!InheritanceUtil.isInheritor(targetClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE)) { return; } if (method.getParameterList().getParametersCount() != 0 || diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ReplaceAssertEqualsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ReplaceAssertEqualsFix.java new file mode 100644 index 000000000000..a91b115561be --- /dev/null +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ReplaceAssertEqualsFix.java @@ -0,0 +1,75 @@ +/* + * Copyright 2000-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.siyeh.ig.junit; + +import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.psi.*; +import com.intellij.util.IncorrectOperationException; +import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.ig.PsiReplacementUtil; +import com.siyeh.ig.psiutils.ImportUtils; +import org.jetbrains.annotations.NotNull; + +class ReplaceAssertEqualsFix extends InspectionGadgetsFix { + private final String myMethodName; + + public ReplaceAssertEqualsFix(String methodName) { + myMethodName = methodName; + } + + @Override + @NotNull + public String getFamilyName() { + return InspectionGadgetsBundle.message("replace.assertequals.quickfix", myMethodName); + } + + @Override + protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { + final PsiElement element = descriptor.getPsiElement(); + final PsiElement parent = element.getParent(); + if (!(parent instanceof PsiReferenceExpression)) { + return; + } + final PsiReferenceExpression methodExpression = (PsiReferenceExpression)parent; + final PsiElement grandParent = methodExpression.getParent(); + if (!(grandParent instanceof PsiMethodCallExpression)) { + return; + } + final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; + final PsiMethod method = methodCallExpression.resolveMethod(); + if (method == null) { + return; + } + final PsiClass containingClass = method.getContainingClass(); + if (containingClass == null) { + return; + } + final String className = containingClass.getQualifiedName(); + if (className == null) { + return; + } + final PsiExpression qualifier = methodExpression.getQualifierExpression(); + if (qualifier == null && ImportUtils.addStaticImport(className, myMethodName, methodExpression)) { + PsiReplacementUtil.replaceExpression(methodExpression, myMethodName); + } + else { + PsiReplacementUtil.replaceExpression(methodExpression, StringUtil.getQualifiedName(className, myMethodName)); + } + } +} diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java index e0648c5fd57a..acda10bd2c95 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java @@ -721,7 +721,8 @@ public class SimplifiableJUnitAssertionInspection extends BaseInspection { return false; } final String qualifiedName = targetClass.getQualifiedName(); - return JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT.equals(qualifiedName) || "junit.framework.TestCase".equals(qualifiedName) || + return JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT.equals(qualifiedName) || JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE + .equals(qualifiedName) || JUnitCommonClassNames.ORG_JUNIT_ASSERT.equals(qualifiedName); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java index acd8a2415af0..7bb52b0c38bb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java @@ -66,7 +66,7 @@ public class StaticSuiteInspection extends BaseInspection { return; } if (!InheritanceUtil.isInheritor(aClass, - "junit.framework.TestCase")) { + JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE)) { return; } final PsiParameterList parameterList = method.getParameterList(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SuperTearDownInFinallyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SuperTearDownInFinallyInspection.java index a52477f6a55d..6dd155c9385e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SuperTearDownInFinallyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SuperTearDownInFinallyInspection.java @@ -59,7 +59,7 @@ public class SuperTearDownInFinallyInspection extends BaseInspection { return; } final PsiClass containingClass = method.getContainingClass(); - if (!InheritanceUtil.isInheritor(containingClass, "junit.framework.TestCase")) { + if (!InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE)) { return; } final PsiTryStatement tryStatement = diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestCaseWithNoTestMethodsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestCaseWithNoTestMethodsInspection.java index 4c82c3e1f107..6c69b811c1dc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestCaseWithNoTestMethodsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestCaseWithNoTestMethodsInspection.java @@ -84,7 +84,7 @@ public class TestCaseWithNoTestMethodsInspection extends BaseInspection { return; } if (!InheritanceUtil.isInheritor(aClass, - "junit.framework.TestCase")) { + JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE)) { return; } final PsiMethod[] methods = aClass.getMethods(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java index 39dab521bfa9..01fc3412f67b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java @@ -80,7 +80,7 @@ public class UseOfObsoleteAssertInspection extends BaseInspection { return; } final String name = containingClass.getQualifiedName(); - if (JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT.equals(name) || "junit.framework.TestCase".equals(name)) { + if (JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT.equals(name) || JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE.equals(name)) { registerMethodCallError(expression, name); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java index 1020bb1f9ef4..eadaa038c86e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java @@ -24,6 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; +import com.siyeh.ig.junit.JUnitCommonClassNames; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -99,7 +100,7 @@ public class TestUtils { } public static boolean isJUnitTestClass(@Nullable PsiClass targetClass) { - return targetClass != null && InheritanceUtil.isInheritor(targetClass, "junit.framework.TestCase"); + return targetClass != null && InheritanceUtil.isInheritor(targetClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE); } public static boolean isJUnit4TestClass(@Nullable PsiClass aClass, boolean runWithIsTestClass) { diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/AssertEqualsCalledOnArrayInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/AssertEqualsCalledOnArrayInspectionTest.java index ae57eaf96289..669f07c660be 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/AssertEqualsCalledOnArrayInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/AssertEqualsCalledOnArrayInspectionTest.java @@ -43,7 +43,7 @@ public class AssertEqualsCalledOnArrayInspectionTest extends IGQuickFixesTestCas } private void doFixTest() { - doTest(getTestName(true), InspectionGadgetsBundle.message("assertequals.called.on.arrays.quickfix")); + doTest(getTestName(true), InspectionGadgetsBundle.message("replace.assertequals.quickfix", "assertArrayEquals")); } @Override