Server Unit Tests

Removed @mock annotation
miniwolf · Dec 1, 2024 · 8c743ee · 8c743ee
1 parent 15a05b2
commit 8c743ee
Show file tree

Hide file tree

Showing 5 changed files with 189 additions and 51 deletions.
diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendRequestTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendRequestTests.java
@@ -6,7 +6,6 @@
 import com.fagi.util.OutputAgentTestUtil;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -20,9 +19,10 @@
 
 @ExtendWith(MockitoExtension.class)
 public class DeleteFriendRequestTests extends BaseInputHandlerTest {
-    @Mock private User user;
+    private User user;
 
     void beforeEach() {
+        user = Mockito.mock(User.class);
     }
 
     @Test

diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/DeleteFriendTests.java
@@ -6,7 +6,6 @@
 import com.fagi.util.OutputAgentTestUtil;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -20,9 +19,10 @@
 
 @ExtendWith(MockitoExtension.class)
 public class DeleteFriendTests extends BaseInputHandlerTest {
-    @Mock private User user;
+    private User user;
 
     void beforeEach() {
+        user = Mockito.mock(User.class);
     }
 
     @Test

diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/FriendRequestServerTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/FriendRequestServerTests.java
@@ -15,7 +15,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -30,9 +29,11 @@
 
 @ExtendWith(MockitoExtension.class)
 class FriendRequestServerTests extends BaseInputHandlerTest {
-    @Mock private User user;
+    private User user;
 
     void beforeEach() {
+        user = Mockito.mock(User.class);
+
         var username = "bob";
 
         doReturn(username)

diff --git a/fagiServer/src/test/java/com/fagi/handler/inputhandler/GetFriendListRequestTests.java b/fagiServer/src/test/java/com/fagi/handler/inputhandler/GetFriendListRequestTests.java
@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
-import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.ArrayList;
@@ -28,11 +28,12 @@
 
 @ExtendWith(MockitoExtension.class)
 class GetFriendListRequestTests extends BaseInputHandlerTest {
-    @Mock private User user;
     @Captor private ArgumentCaptor<FriendList> friendListArgumentCaptor;
     private final List<String> friendsUsernames = new ArrayList<>();
 
     void beforeEach() {
+        User user = Mockito.mock(User.class);
+
         doReturn(user)
                 .when(data)
                 .getUser(anyString());