phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit tests of AvoidSoqlInLoopsRule

Browse Source
This commit is contained in:
Andreas Dangel
2016-03-27 17:24:42 +02:00
parent aad2059731
commit acacf1906e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/basic/AvoidSoqlInLoopsRule.java
View File

@ -17,7 +17,7 @@ public class AvoidSoqlInLoopsRule extends AbstractOptimizationRule {
@Override @Override
public Object visit(ASTSoqlExpression node, Object data) { public Object visit(ASTSoqlExpression node, Object data) {
if (insideLoop(node) && fourthParentNotThrow(node) && fourthParentNotReturn(node)) { if (insideLoop(node) && fourthParentNotThrow(node) && parentNotReturn(node)) {
addViolation(data, node); addViolation(data, node);
} }
return data; return data;
@ -27,8 +27,8 @@ public class AvoidSoqlInLoopsRule extends AbstractOptimizationRule {
return !(node.jjtGetParent().jjtGetParent().jjtGetParent().jjtGetParent() instanceof ASTThrowStatement); return !(node.jjtGetParent().jjtGetParent().jjtGetParent().jjtGetParent() instanceof ASTThrowStatement);
} }
private boolean fourthParentNotReturn(ASTSoqlExpression node) { private boolean parentNotReturn(ASTSoqlExpression node) {
return !(node.jjtGetParent().jjtGetParent().jjtGetParent().jjtGetParent() instanceof ASTReturnStatement); return !(node.jjtGetParent() instanceof ASTReturnStatement);
} }
private boolean insideLoop(ASTSoqlExpression node) { private boolean insideLoop(ASTSoqlExpression node) {
@ -39,10 +39,6 @@ public class AvoidSoqlInLoopsRule extends AbstractOptimizationRule {
|| n instanceof ASTForLoopStatement || n instanceof ASTForEachStatement) { || n instanceof ASTForLoopStatement || n instanceof ASTForEachStatement) {
return true; return true;
} }
else if (n.jjtGetParent() instanceof ASTForLoopStatement || n.jjtGetParent() instanceof ASTForEachStatement) {
n = n.jjtGetParent();
}
n = n.jjtGetParent(); n = n.jjtGetParent();
} }
return false; return false;