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

assertEquals can be replaced with assertSame: introduce junit 5; extract common fix

Browse Source
This commit is contained in:
Anna.Kozlova
2016-10-18 18:11:07 +02:00
parent c28bda6b3f
commit b38ca21bac
16 changed files with 100 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
+1 -1
View File
@@ -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 <code>#ref</code> #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
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsCalledOnArrayInspection.java
+2 -41
View File
@@ -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);
}
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsHint.java
+3 -8
View File
@@ -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) {
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java
+6 -69
View File
@@ -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;
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitAbstractTestClassNamingConventionInspectionBase.java
+1 -1
View File
@@ -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();
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java
+1
View File
@@ -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";
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitTestClassNamingConventionInspectionBase.java
+1 -1
View File
@@ -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;
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java
+1 -1
View File
@@ -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 ||
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ReplaceAssertEqualsFix.java
+75
View File
@@ -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));
}
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java
+2 -1
View File
@@ -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);
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java
+1 -1
View File
@@ -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();
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SuperTearDownInFinallyInspection.java
+1 -1
View File
@@ -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 =
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestCaseWithNoTestMethodsInspection.java
+1 -1
View File
@@ -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();
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java
+1 -1
View File
@@ -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);
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java
+2 -1
View File
@@ -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) {
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/AssertEqualsCalledOnArrayInspectionTest.java
+1 -1
View File
@@ -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