add more tests

Author: JuditKnoll

spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/FindCompoundOperationsOnSharedVariablesTest.java

@@ -12,6 +12,18 @@ void happyPath_compoundOperation_onSharedAtomicVariable() {
         assertBugTypeCount(BUG_TYPE, 0);
     }
 
+    @Test
+    void happyPath_compoundOperation_onSharedVariable_volatileReadSyncWrite() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileReadSyncWrite.class");
+        assertBugTypeCount(BUG_TYPE, 0);
+    }
+
+    @Test
+    void happyPath_compoundOperation_readWriteLock() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundNegateReadWriteLock.class");
+        assertBugTypeCount(BUG_TYPE, 0);
+    }
+
     @Test
     void happyPath_compoundOperationInsideSynchronizedBlock_onSharedVariable() {
         performAnalysis("multithreaded/compoundOperationOnSharedVariables/SynchronizedBlockCompoundOperationOnSharedVariable.class");
@@ -51,9 +63,10 @@ void reportsBugFor_compoundPreIncrementation_onSharedVariable() {
     // num++
     @Test
     void reportsBugFor_compoundPostIncrementation_onSharedVariable() {
+        // The order of the functions is reversed
         performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundPostIncrementationOnSharedVariable.class");
         assertBugTypeCount(BUG_TYPE, 1);
-        assertBugInMethodAtLine(BUG_TYPE, "CompoundPostIncrementationOnSharedVariable", "getNum", 11);
+        assertBugInMethodAtLine(BUG_TYPE, "CompoundPostIncrementationOnSharedVariable", "toggle", 11);
     }
 
     // &=
@@ -152,4 +165,60 @@ void reportsBugFor_compoundXOROperation_onSharedVariable() {
         assertBugTypeCount(BUG_TYPE, 1);
         assertBugInMethodAtLine(BUG_TYPE, "CompoundXOROperationOnSharedVariable", "getFlag", 16);
     }
+
+    // num = num + 2
+    @Test
+    void reportsBugFor_simpleAddition_onSharedVariable() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/AdditionOnSharedVariable.class");
+        assertBugTypeCount(BUG_TYPE, 1);
+        assertBugInMethodAtLine(BUG_TYPE, "AdditionOnSharedVariable", "getNum", 11);
+    }
+
+    // num = -num
+    @Test
+    void reportsBugFor_negate_onSharedVariable() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/NegateSharedVariable.class");
+        assertBugTypeCount(BUG_TYPE, 1);
+        assertBugInMethodAtLine(BUG_TYPE, "NegateSharedVariable", "getNum", 11);
+    }
+
+    // num -= num + 2
+    @Test
+    void reportsBugFor_compoundSubtraction_onSharedVariable_complex() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundSubstractComplexExpression.class");
+        assertBugTypeCount(BUG_TYPE, 1);
+        assertBugInMethodAtLine(BUG_TYPE, "CompoundSubstractComplexExpression", "getNum", 11);
+    }
+
+    // num += num2 + 5
+    @Test
+    void reportsBugFor_compoundAddition_onSharedVariable_complex_withAnotherVar() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundAdditionComplexExpressionWithAnotherVar.class");
+        assertBugTypeCount(BUG_TYPE, 1);
+        assertBugInMethodAtLine(BUG_TYPE, "CompoundAdditionComplexExpressionWithAnotherVar", "getNum", 12);
+    }
+
+    // num2 = num; num += 1
+    @Test
+    void reportsBugFor_compoundAddition_onSharedVariable_withAnotherVar() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundAdditionWithAnotherVar.class");
+        assertBugTypeCount(BUG_TYPE, 1);
+        assertBugInMethodAtLine(BUG_TYPE, "CompoundAdditionWithAnotherVar", "getNum", 13);
+    }
+
+    // num += param
+    @Test
+    void reportsBugFor_compoundSubstractionOfArg_onSharedVariable() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfArg.class");
+        assertBugTypeCount(BUG_TYPE, 1);
+        assertBugInMethodAtLine(BUG_TYPE, "CompoundSubstractionOfArg", "getNum", 11);
+    }
+
+    // num += getOne()
+    @Test
+    void reportsBugFor_compoundSubstractionOfFunCall_onSharedVariable() {
+        performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfMethodReturnValue.class");
+        assertBugTypeCount(BUG_TYPE, 1);
+        assertBugInMethodAtLine(BUG_TYPE, "CompoundSubstractionOfMethodReturnValue", "getNum", 11);
+    }
 }

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/AdditionOnSharedVariable.java

@@ -0,0 +1,13 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class AdditionOnSharedVariable extends Thread {
+    private int num = 0;
+
+    public void toggle() {
+        num = num + 2;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionComplexExpressionWithAnotherVar.java

@@ -0,0 +1,18 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class CompoundAdditionComplexExpressionWithAnotherVar extends Thread {
+    private int num = 0;
+    private int num2 = 2;
+
+    public void toggle() {
+        num += num2 + 5;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public Integer getNum2() {
+        return num2;
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileReadSyncWrite.java

@@ -0,0 +1,13 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class CompoundAdditionOnSharedVolatileReadSyncWrite extends Thread {
+    private volatile int num = 0;
+
+    public synchronized void toggle() {
+        num += 2;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionWithAnotherVar.java

@@ -0,0 +1,19 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class CompoundAdditionWithAnotherVar extends Thread {
+    private int num = 0;
+    private int num2 = 2;
+
+    public void toggle() {
+        num2 = num;
+        num += 1;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public Integer getNum2() {
+        return num2;
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundNegateReadWriteLock.java

@@ -0,0 +1,30 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+public class CompoundNegateReadWriteLock extends Thread {
+    private boolean flag = true;
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+    private final Lock readLock = lock.readLock();
+    private final Lock writeLock = lock.writeLock();
+
+    public void toggle() {
+        writeLock.lock();
+        try {
+            flag ^= true; // Same as flag = !flag;
+        } finally {
+            writeLock.unlock();
+        }
+    }
+
+    public boolean getFlag() {
+        readLock.lock();
+        try {
+            return flag;
+        } finally {
+            readLock.unlock();
+        }
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPostIncrementationOnSharedVariable.java

@@ -3,11 +3,11 @@
 public class CompoundPostIncrementationOnSharedVariable extends Thread {
     private double num = 3.0;
 
-    public void toggle() {
-        num++;
-    }
-
     public double getNum() {
         return num;
     }
+
+    public void toggle() {
+        num++;
+    }
 }

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractComplexExpression.java

@@ -0,0 +1,13 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class CompoundSubstractComplexExpression extends Thread {
+    private int num = 0;
+
+    public void toggle() {
+        num -= num + 2;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfArg.java

@@ -0,0 +1,13 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class CompoundSubstractionOfArg extends Thread {
+    private int num = 0;
+
+    public void toggle(int param) {
+        num += param;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfMethodReturnValue.java

@@ -0,0 +1,17 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class CompoundSubstractionOfMethodReturnValue extends Thread {
+    private int num = 0;
+
+    public void toggle() {
+        num += getOne();
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    private int getOne() {
+        return 1;
+    }
+}

spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/NegateSharedVariable.java

@@ -0,0 +1,13 @@
+package multithreaded.compoundOperationOnSharedVariables;
+
+public class NegateSharedVariable extends Thread {
+    private int num = 3;
+
+    public void toggle() {
+        num = -num;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+}