pmd: fixed bug #3526212 with immutable field and compound assignment

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@7683 51baf565-9d33-0410-a72c-fc3788e3496d
hooperbloob · Jun 2, 2012 · eb6c0c8 · eb6c0c8
1 parent 196a5f1
commit eb6c0c8
Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
@@ -27,6 +27,7 @@ TODO - Release blockers - Must implement before this release can be finally fini
      and pmd-java:typeof).
 
 
+Fixed bug 3526212: pmd-5.0.0: ImmutableField false positive on self-inc/dec
 Fixed bug 3526992: pmd-5.0.0: False + UselessParentheses
 Fixed bug 3523614: newline characters stripped from CPD data in PMD 5.0.0
 Fixed bug 3516101: InsufficientStringBufferDeclaration fails to parse hex

diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/NameOccurrence.java b/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/NameOccurrence.java
@@ -148,13 +148,12 @@ public boolean isSelfAssignment() {
                 return true;
             }
 
-            if (node instanceof ASTStatementExpression || node instanceof ASTExpression) {
-                if (node.jjtGetNumChildren() >= 2 && node.jjtGetChild(1) instanceof ASTAssignmentOperator) {
-                    ASTAssignmentOperator op = (ASTAssignmentOperator) node.jjtGetChild(1);
-                    if (op.isCompound()) {
-                        return true;
-                    }
-                }
+            if (hasAssignmentOperator(gp)) {
+                return isCompoundAssignment(gp);
+            }
+
+            if (hasAssignmentOperator(node)) {
+                return isCompoundAssignment(node);
             }
 
             // deal with extra parenthesis: "(i)++"
@@ -171,6 +170,15 @@ public boolean isSelfAssignment() {
         }
     }
 
+    private boolean hasAssignmentOperator(Node node) {
+        if (node instanceof ASTStatementExpression || node instanceof ASTExpression) {
+            if (node.jjtGetNumChildren() >= 2 && node.jjtGetChild(1) instanceof ASTAssignmentOperator) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Simply return true is the image is equal to keyword 'this' or 'super'.
      *

diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml
@@ -310,4 +310,27 @@ public class MyClass {
 }
      ]]></code>
     </test-code>
+    <test-code>
+        <description>
+3526212, pmd-5.0.0: ImmutableField false positive on self-inc/dec
+        </description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class pmd_inc {
+    private int test;
+
+    public pmd_inc() {
+        this.test = 2;
+    }
+
+    public int get_test() {
+        return this.test;
+    }
+
+    public void inc_test(int val) {
+        this.test += val;
+    }
+}
+        ]]></code>
+    </test-code>
 </test-data>