Fix Mockito do-syntax (#274)

* Fix do-syntax in tests

* Fix do-syntax handling in MockitoWhen

Author: martinmladenov

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);

andy/src/test/resources/codechecker/fixtures/MockitoWhenCalls.java

@@ -36,7 +36,7 @@ void t2() {
     void t3(){
         List<String> mockedList = mock(List.class);
         Mockito.doThrow(IllegalArgumentException.class).when(mockedList).toString();
-        doNothing().when(mockedList.size());
+        doNothing().when(mockedList).size();
         doReturn("2").when(mockedList).get(any(Integer.class));
 
         verify(mockedList, times(2)).toString();
@@ -46,9 +46,9 @@ void t3(){
     @Test
     void t4(){
         List<String> mockedList = mock(List.class);
-        Mockito.doNothing().when(mockedList.size());
-        doReturn("2").when(mockedList.get(any(Integer.class)));
-        doReturn("3").when(mockedList.remove(any(Integer.class)));
+        Mockito.doNothing().when(mockedList).size();
+        doReturn("2").when(mockedList).get(any(Integer.class));
+        doReturn("3").when(mockedList).remove(any(Integer.class));
 
         verify(mockedList, times(1)).remove(1);
         verify(mockedList, times(1)).remove(2);
@@ -57,4 +57,18 @@ void t4(){
         verify(mockedList, times(1)).get(5);
     }
 
+    @Test
+    void t5(){
+        List<String> mockedList = mock(List.class);
+        Mockito.doReturn(3).when(mockedList).size();
+        mockedList.get(3);
+    }
+
+    @Test
+    void t6(){
+        List<String> mockedList = mock(List.class);
+        Mockito.doReturn(3).when(mockedList.get(3));
+        mockedList.get(3);
+    }
+
 }