setting up Mock annotation to be used (#259)

* setting up Mock annotation to be used

* handled erroneous override of mocked bool

andy/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/MockClass.java

@@ -1,6 +1,9 @@
 package nl.tudelft.cse1110.andy.codechecker.checks;
 
 import org.eclipse.jdt.core.dom.MethodInvocation;
+import org.eclipse.jdt.core.dom.Annotation;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+
 
 /**
  * Checks whether the class was mocked via Mockito.mock(..).
@@ -38,6 +41,23 @@ public boolean visit(MethodInvocation mi) {
         return super.visit(mi);
     }
 
+    @Override
+    public boolean visit(FieldDeclaration fd) {
+        // added this if-check to avoid overriding classWasMocked erroneously.
+        if(!classWasMocked) {
+            boolean hasMockAnnotation = fd.modifiers().stream()
+                    .anyMatch(m -> m instanceof Annotation &&
+                            ((Annotation) m).getTypeName().getFullyQualifiedName().equals("Mock"));
+
+            // If the field is annotated with @Mock, check if it's the class we are interested in
+            if (hasMockAnnotation) {
+                String className = fd.getType().toString();
+                classWasMocked = className.contains(classToBeMocked);
+            }
+        }
+        return super.visit(fd);
+    }
+
 
     @Override
     public boolean result() {

andy/src/test/java/unit/codechecker/checks/MockClassTest.java

@@ -10,7 +10,7 @@
 public class MockClassTest extends ChecksBaseTest {
 
     @ParameterizedTest
-    @CsvSource({"List,true", "Set,true", "HashMap,false"})
+    @CsvSource({"List,true", "Set,true", "Queue,true", "Deque,true", "HashMap,false"})
     void findMocks(String classToMock, boolean expectation) {
         Check check = new MockClass(classToMock);
         run("ManyMocks.java", check);

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

@@ -6,8 +6,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.Queue;
+import java.util.Deque;
+import java.util.SortedSet;
 
 import static org.mockito.Mockito.mock;
+import org.mockito.MockitoAnnotations;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Check if a specific class was mocked at least once, anywhere in
@@ -21,6 +26,21 @@
  */
 public class ManyMocks {
 
+    // Mock with annotation
+    @Mock
+    Queue<String> mockedQueue;
+
+    @Mock
+    SortedSet<String> sortedSetMocked;
+
+    @Mock
+    Deque<String> mockedDQ;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+    }
+
     @Test
     void t1() {
         // full call to the static method
@@ -30,4 +50,5 @@ void t1() {
         // no mock
         HashMap<String, String> concreteHashMap = new HashMap<>();
     }
+
 }