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

IDEADEV-40754: testng's Assert.assertNotNull have parameters in opposite order comparing to junit counterpart

Browse Source
This commit is contained in:
Maxim Shafirov
2009-10-08 14:47:54 +04:00
parent 40a6a2a24c
commit 2967a2fb6f
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+12 -9
View File
@@ -1125,29 +1125,30 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
final String className = owner.getQualifiedName();
if ("java.lang.System".equals(className)) {
if ("exit".equals(methodName)) {
pushParameters(params, false);
pushParameters(params, false, false);
addInstruction(new ReturnInstruction());
return true;
}
}
else if ("junit.framework.Assert".equals(className) || "org.junit.Assert".equals(className) || "org.testng.Assert".equals(className)) {
boolean testng = "org.testng.Assert".equals(className);
if ("fail".equals(methodName)) {
pushParameters(params, false);
pushParameters(params, false, !testng);
addInstruction(new ReturnInstruction());
return true;
}
else if ("assertTrue".equals(methodName)) {
pushParameters(params, true);
pushParameters(params, true, !testng);
conditionalExit(exitPoint, false);
return true;
}
else if ("assertFalse".equals(methodName)) {
pushParameters(params, true);
pushParameters(params, true, !testng);
conditionalExit(exitPoint, true);
return true;
}
else if ("assertNull".equals(methodName)) {
pushParameters(params, true);
pushParameters(params, true, !testng);
addInstruction(new PushInstruction(myFactory.getConstFactory().getNull(), null));
addInstruction(new BinopInstruction("==", null, expression.getProject()));
@@ -1155,7 +1156,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
return true;
}
else if ("assertNotNull".equals(methodName)) {
pushParameters(params, true);
pushParameters(params, true, !testng);
addInstruction(new PushInstruction(myFactory.getConstFactory().getNull(), null));
addInstruction(new BinopInstruction("==", null, expression.getProject()));
@@ -1202,13 +1203,15 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
pushUnknown();
}
private void pushParameters(final PsiExpression[] params, final boolean leaveLastOnStack) {
private void pushParameters(final PsiExpression[] params, final boolean leaveOnStack, boolean lastParameterIsSignificant) {
for (int i = 0; i < params.length; i++) {
PsiExpression param = params[i];
param.accept(this);
if (!leaveLastOnStack || i < params.length - 1) {
addInstruction(new PopInstruction());
if (leaveOnStack) {
if (lastParameterIsSignificant && i == params.length - 1 || !lastParameterIsSignificant && i == 0) continue;
}
addInstruction(new PopInstruction());
}
}