Fix do-syntax handling in MockitoWhen

SERG-Delft · Jul 22, 2024 · be6b295 · be6b295
1 parent f661d91
commit be6b295
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/andy/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/MockitoWhen.java b/andy/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/MockitoWhen.java
@@ -47,16 +47,12 @@ public boolean visit(MethodInvocation mi) {
          * If the method call just after when() matches the one we are expecting, bingo!
          */
         if(inWhenMode) {
-            if(methodToSetUp.equals(methodName) || methodToSetUp.equals(previousMethodName)) {
+            if(methodToSetUp.equals(methodName) ||
+                    methodToSetUp.equals(previousMethodName) && allowedDoInvocations.contains(methodName)) {
                 numberOfCallsToWhen++;
-                inWhenMode = false;
-                previousMethodName = "";
-            } else if(notInDoWhenOrNoMatch(methodName)){
-                inWhenMode = false;
-                previousMethodName = "";
-            } else {
-                previousMethodName = methodName;
             }
+            inWhenMode = false;
+            previousMethodName = "";
         } else {
             /**
              * We wait for a call to when().
@@ -70,12 +66,7 @@ public boolean visit(MethodInvocation mi) {
         }
         return super.visit(mi);
     }
-    private boolean notInDoWhenOrNoMatch(String methodName){
-        return !methodName.equals("when")
-                &&
-            (allowedDoInvocations.contains(previousMethodName)
-                || !allowedDoInvocations.contains(methodName));
-    }
+
     @Override
     public boolean result() {
         return comparison.compare(numberOfCallsToWhen, expectedNumberOfOccurrences);