From c4a9c2f7c3aefa5c5be84fdfcf6b34a74e0d3306 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 18 Oct 2016 15:54:32 +0200 Subject: [PATCH] common constants --- ...lsBetweenInconvertibleTypesInspection.java | 6 ++--- .../AssertEqualsCalledOnArrayInspection.java | 7 +++--- ...AssertEqualsMayBeAssertSameInspection.java | 3 ++- .../AssertsWithoutMessagesInspection.java | 4 ++-- ...ConstantJUnitAssertArgumentInspection.java | 4 ++-- .../siyeh/ig/junit/JUnitCommonClassNames.java | 22 +++++++++++++++++++ ...edAssertEqualsArgumentsInspectionBase.java | 8 +++---- .../SimplifiableJUnitAssertionInspection.java | 8 +++---- ...tMethodWithoutAssertionInspectionBase.java | 4 ++-- .../junit/UseOfObsoleteAssertInspection.java | 8 +++---- 10 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java index 4c71b52fbb44..454b4f880329 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java @@ -70,9 +70,9 @@ public class AssertEqualsBetweenInconvertibleTypesInspection extends BaseInspect return; } final PsiClass containingClass = method.getContainingClass(); - final boolean junit5Assertions = InheritanceUtil.isInheritor(containingClass, "org.junit.jupiter.api.Assertions"); - if (!InheritanceUtil.isInheritor(containingClass, "junit.framework.Assert") && - !InheritanceUtil.isInheritor(containingClass, "org.junit.Assert") && + final boolean junit5Assertions = InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.ORG_JUNIT_JUPITER_API_ASSERTIONS); + if (!InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT) && + !InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.ORG_JUNIT_ASSERT) && !junit5Assertions) { return; } 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 29285d538995..c67185790c26 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsCalledOnArrayInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsCalledOnArrayInspection.java @@ -31,6 +31,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; public class AssertEqualsCalledOnArrayInspection extends BaseInspection { + @Nls @NotNull @Override @@ -66,7 +67,7 @@ public class AssertEqualsCalledOnArrayInspection extends BaseInspection { } final PsiReferenceExpression methodExpression = (PsiReferenceExpression)parent; final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if (qualifier == null && ImportUtils.addStaticImport("org.junit.Assert", "assertArrayEquals", methodExpression)) { + if (qualifier == null && ImportUtils.addStaticImport(JUnitCommonClassNames.ORG_JUNIT_ASSERT, "assertArrayEquals", methodExpression)) { PsiReplacementUtil.replaceExpression(methodExpression, "assertArrayEquals"); } else { @@ -117,8 +118,8 @@ public class AssertEqualsCalledOnArrayInspection extends BaseInspection { return; } final PsiClass containingClass = method.getContainingClass(); - if (!InheritanceUtil.isInheritor(containingClass, "junit.framework.Assert") && - !InheritanceUtil.isInheritor(containingClass, "org.junit.Assert") && + if (!InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT) && + !InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.ORG_JUNIT_ASSERT) && !InheritanceUtil.isInheritor(containingClass, "org.testng.AssertJUnit")) { return; } 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 70ad1c28657c..73dcba18d921 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java @@ -119,7 +119,8 @@ public class AssertEqualsMayBeAssertSameInspection extends BaseInspection { return; } final String qualifiedName = aClass.getQualifiedName(); - if (!"org.junit.Assert".equals(qualifiedName) && !"junit.framework.Assert".equals(qualifiedName) && + if (!JUnitCommonClassNames.ORG_JUNIT_ASSERT.equals(qualifiedName) && !JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT + .equals(qualifiedName) && !"junit.framework.TestCase".equals(qualifiedName)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java index 9a928a8fd2c3..87d5ed2a37fb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java @@ -82,8 +82,8 @@ public class AssertsWithoutMessagesInspection extends BaseInspection { return; } final PsiClass containingClass = method.getContainingClass(); - if (!InheritanceUtil.isInheritor(containingClass, "junit.framework.Assert") && - !InheritanceUtil.isInheritor(containingClass, "org.junit.Assert")) { + if (!InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT) && + !InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.ORG_JUNIT_ASSERT)) { return; } final PsiParameterList parameterList = method.getParameterList(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ConstantJUnitAssertArgumentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ConstantJUnitAssertArgumentInspection.java index 8e4b25a0b284..e02bfb7bc0fd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ConstantJUnitAssertArgumentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ConstantJUnitAssertArgumentInspection.java @@ -79,9 +79,9 @@ public class ConstantJUnitAssertArgumentInspection extends BaseInspection { } final PsiClass containingClass = method.getContainingClass(); if (!InheritanceUtil.isInheritor(containingClass, - "junit.framework.Assert") && + JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT) && !InheritanceUtil.isInheritor(containingClass, - "org.junit.Assert")) { + JUnitCommonClassNames.ORG_JUNIT_ASSERT)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java new file mode 100644 index 000000000000..e4c9a211a2a0 --- /dev/null +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitCommonClassNames.java @@ -0,0 +1,22 @@ +/* + * 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; + +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"; +} diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java index cafd4282d979..7f3cc208f61e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java @@ -91,8 +91,8 @@ public abstract class MisorderedAssertEqualsArgumentsInspectionBase extends Base junit = false; } else if (InheritanceUtil.isInheritor(containingClass, "org.testng.AssertJUnit") || - InheritanceUtil.isInheritor(containingClass, "junit.framework.Assert") || - InheritanceUtil.isInheritor(containingClass, "org.junit.Assert")) { + InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT) || + InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.ORG_JUNIT_ASSERT)) { junit = true; } else { @@ -156,8 +156,8 @@ public abstract class MisorderedAssertEqualsArgumentsInspectionBase extends Base final PsiExpression actualArgument; if (checkTestNG() ? InheritanceUtil.isInheritor(containingClass, "org.testng.AssertJUnit") : - InheritanceUtil.isInheritor(containingClass, "junit.framework.Assert") || - InheritanceUtil.isInheritor(containingClass, "org.junit.Assert")) { + InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT) || + InheritanceUtil.isInheritor(containingClass, JUnitCommonClassNames.ORG_JUNIT_ASSERT)) { final PsiType firstArgumentType = arguments[0].getType(); if (stringType.equals(firstArgumentType) && arguments.length > 2) { expectedArgument = arguments[1]; 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 fcab7d46a7b9..e0648c5fd57a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java @@ -90,8 +90,8 @@ public class SimplifiableJUnitAssertionInspection extends BaseInspection { return; } final PsiClass containingClass = method.getContainingClass(); - if (containingClass != null && "org.junit.Assert".equals(containingClass.getQualifiedName()) && - !ImportUtils.addStaticImport("org.junit.Assert", methodName, originalMethodCall)) { + if (containingClass != null && JUnitCommonClassNames.ORG_JUNIT_ASSERT.equals(containingClass.getQualifiedName()) && + !ImportUtils.addStaticImport(JUnitCommonClassNames.ORG_JUNIT_ASSERT, methodName, originalMethodCall)) { // add qualifier if old call was to JUnit4 method and adding static import failed out.append("org.junit.Assert."); } @@ -721,7 +721,7 @@ public class SimplifiableJUnitAssertionInspection extends BaseInspection { return false; } final String qualifiedName = targetClass.getQualifiedName(); - return "junit.framework.Assert".equals(qualifiedName) || "junit.framework.TestCase".equals(qualifiedName) || - "org.junit.Assert".equals(qualifiedName); + return JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT.equals(qualifiedName) || "junit.framework.TestCase".equals(qualifiedName) || + JUnitCommonClassNames.ORG_JUNIT_ASSERT.equals(qualifiedName); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodWithoutAssertionInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodWithoutAssertionInspectionBase.java index 62bb0b940c86..f794e08a9c08 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodWithoutAssertionInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodWithoutAssertionInspectionBase.java @@ -35,8 +35,8 @@ public class TestMethodWithoutAssertionInspectionBase extends BaseInspection { public TestMethodWithoutAssertionInspectionBase() { methodMatcher = new MethodMatcher(true, "assertionMethods") - .add("org.junit.Assert", "assert.*|fail.*") - .add("junit.framework.Assert", "assert.*|fail.*") + .add(JUnitCommonClassNames.ORG_JUNIT_ASSERT, "assert.*|fail.*") + .add(JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT, "assert.*|fail.*") .add("org.mockito.Mockito", "verify.*") .add("org.mockito.InOrder", "verify") .add("org.junit.rules.ExpectedException", "expect.*") 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 e64db5b5e56f..39dab521bfa9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java @@ -67,7 +67,7 @@ public class UseOfObsoleteAssertInspection extends BaseInspection { return; } final PsiClass newAssertClass = JavaPsiFacade.getInstance(project) - .findClass("org.junit.Assert", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module)); + .findClass(JUnitCommonClassNames.ORG_JUNIT_ASSERT, GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module)); if (newAssertClass == null) { return; } @@ -80,7 +80,7 @@ public class UseOfObsoleteAssertInspection extends BaseInspection { return; } final String name = containingClass.getQualifiedName(); - if ("junit.framework.Assert".equals(name) || "junit.framework.TestCase".equals(name)) { + if (JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT.equals(name) || "junit.framework.TestCase".equals(name)) { registerMethodCallError(expression, name); } } @@ -94,9 +94,9 @@ public class UseOfObsoleteAssertInspection extends BaseInspection { return; } final PsiClass newAssertClass = - JavaPsiFacade.getInstance(project).findClass("org.junit.Assert", GlobalSearchScope.allScope(project)); + JavaPsiFacade.getInstance(project).findClass(JUnitCommonClassNames.ORG_JUNIT_ASSERT, GlobalSearchScope.allScope(project)); final PsiClass oldAssertClass = - JavaPsiFacade.getInstance(project).findClass("junit.framework.Assert", GlobalSearchScope.allScope(project)); + JavaPsiFacade.getInstance(project).findClass(JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT, GlobalSearchScope.allScope(project)); if (newAssertClass == null) { return;