1 files changed, 16 insertions, 37 deletions
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java
index 31ada05..7770c40 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java
@@ -1,14 +1,15 @@
 package com.ufund.api.ufundapi.service;
 
-import java.io.IOException;
-
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.ufund.api.ufundapi.DuplicateKeyException;
 import com.ufund.api.ufundapi.model.User;
@@ -21,23 +22,29 @@ public class AuthServiceTest {
     private UserAuthDAO mockAuthDAO;
     private UserService mockUserService;
     private AuthService authService;
+    private String username;
+    private String key;
+    private String password;
+    private User user;
 
     @BeforeEach
     public void setupAuthService() {
         mockAuthDAO = mock(UserAuthDAO.class);
         mockUserService = mock(UserService.class);
         authService = new AuthService(mockAuthDAO, mockUserService);
+        
+        username = "Fish";
+        password = "sticks";
+        key = UserAuth.generate(username).getKey();
+        user = User.create(username, password);
 
     }
 
     @Test
     public void testAuthenticate() throws IOException {
-        // Setup
-        String username = "Fish";
-        String key = UserAuth.generate(username).getKey();
-
         // Mock
         when(mockAuthDAO.getUserAuth(key)).thenReturn(new UserAuth(key, username, null));
+        when(mockUserService.getUser(username)).thenReturn(user);
 
         // Analyze
         assertDoesNotThrow(() -> authService.authenticate(username, key));
@@ -46,12 +53,9 @@ public class AuthServiceTest {
 
     @Test
     public void testAuthenticateMismatchName() throws IOException {
-        // Setup
-        String username = "Fish";
-        String key = UserAuth.generate(username).getKey();
-
         // Mock
         when(mockAuthDAO.getUserAuth(key)).thenReturn(new UserAuth(key, "EvilFish", null));
+        when(mockUserService.getUser("EvilFish")).thenReturn(user);
 
         // Analyze
         assertThrows(IllegalAccessException.class, () -> authService.authenticate(username, key));
@@ -60,10 +64,6 @@ public class AuthServiceTest {
 
     @Test
     public void testAuthenticateMissingUserAuth() throws IOException {
-        // Setup
-        String username = "Fish";
-        String key = UserAuth.generate(username).getKey();
-
         // Mock
         when(mockAuthDAO.getUserAuth(key)).thenReturn(null);
 
@@ -74,11 +74,6 @@ public class AuthServiceTest {
 
     @Test
     public void testLogin() throws IOException, DuplicateKeyException, IllegalAccessException {
-        // Setup
-        String username = "Fish";
-        String password = "Chips";
-        User user = User.create(username, password);
-
         // Mock
         when(mockUserService.getUser(username)).thenReturn(user);
                 
@@ -89,11 +84,6 @@ public class AuthServiceTest {
 
     @Test
     public void testLoginNullUser() throws IOException, DuplicateKeyException, IllegalAccessException {
-        // Setup
-        String username = "Fish";
-        String password = "Chips";
-        User user = User.create(username, password);
-
         // Mock
         when(mockUserService.getUser(username)).thenReturn(null);
 
@@ -103,11 +93,6 @@ public class AuthServiceTest {
 
     @Test
     public void testLoginMismatchPasswords() throws IOException, DuplicateKeyException, IllegalAccessException {
-        // Setup
-        String username = "Fish";
-        String password = "Chips";
-        User user = User.create(username, password);
-
         // Mock
         when(mockUserService.getUser(username)).thenReturn(User.create(username, "fries"));
 
@@ -117,12 +102,6 @@ public class AuthServiceTest {
 
     @Test
     public void testLogout() throws IOException, DuplicateKeyException, IllegalAccessException {
-        // Setup
-        String username = "Fish";
-        String password = "Chips";
-        String key = UserAuth.generate(username).getKey();
-        User user = User.create(username, password);
-
         // Analyze
         assertDoesNotThrow(() -> authService.logout(key));