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

misordered actual/equals for one framework at a time

Browse Source
This commit is contained in:
Anna.Kozlova
2016-10-19 16:46:49 +02:00
parent 971f617d94
commit b4c7771a96
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/AssertHint.java
+5 -1
View File
@@ -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) {
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java
+10 -4
View File
@@ -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;
}