From b4c7771a9682c7e04a097eb968f29f0252768871 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Wed, 19 Oct 2016 16:22:41 +0200 Subject: [PATCH] misordered actual/equals for one framework at a time --- .../src/com/siyeh/ig/junit/AssertHint.java | 6 +++++- ...orderedAssertEqualsArgumentsInspectionBase.java | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertHint.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertHint.java index f171ee308211..984047f634b5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertHint.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertHint.java @@ -114,9 +114,13 @@ public class AssertHint { } public static boolean isMessageOnLastPosition(PsiClass containingClass) { + return isMessageOnLastPosition(containingClass, true); + } + + public static boolean isMessageOnLastPosition(PsiClass containingClass, boolean checkTestNG) { final String qualifiedName = containingClass.getQualifiedName(); return JUnitCommonClassNames.ORG_JUNIT_JUPITER_API_ASSERTIONS.equals(qualifiedName) || - "org.testng.Assert".equals(qualifiedName); + checkTestNG && "org.testng.Assert".equals(qualifiedName); } public static String areExpectedActualTypesCompatible(PsiMethodCallExpression expression) { 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 ecee23b73a66..51f1adcb282b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java @@ -123,13 +123,19 @@ public abstract class MisorderedAssertEqualsArgumentsInspectionBase extends Base final PsiClass containingClass = method.getContainingClass(); final PsiExpression expectedArgument; final PsiExpression actualArgument; - if (checkTestNG && InheritanceUtil.isInheritor(containingClass, "org.testng.Assert")){ - expectedArgument = arguments[1]; - actualArgument = arguments[0]; + if (checkTestNG){ + if (InheritanceUtil.isInheritor(containingClass, "org.testng.Assert")) { + expectedArgument = arguments[1]; + actualArgument = arguments[0]; + } + else { + expectedArgument = null; + actualArgument = null; + } } else { final boolean messageOnFirstPosition = AssertHint.isMessageOnFirstPosition(containingClass); - final boolean messageOnLastPosition = AssertHint.isMessageOnLastPosition(containingClass); + final boolean messageOnLastPosition = AssertHint.isMessageOnLastPosition(containingClass, false); if (!messageOnFirstPosition && !messageOnLastPosition) { return null; }