Merge branch 'main' of https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b

3 files changed, 75 insertions, 11 deletions

diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/CupboardFileDAOTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/CupboardFileDAOTest.java
index 7888084..f786a8c 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/CupboardFileDAOTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/CupboardFileDAOTest.java
@@ -20,17 +20,18 @@ import com.ufund.api.ufundapi.model.Need.GoalType;
 
 @Tag("Persistence-tier")
 public class CupboardFileDAOTest {
-    CupboardFileDAO cupboardFileDao;
-    Need[] testNeeds;
-    ObjectMapper mockObjectMapper;
+    private CupboardFileDAO cupboardFileDao;
+    private Need[] testNeeds;
+    private ObjectMapper mockObjectMapper;
 
     @BeforeEach
     public void setupCupboardFileDao() throws IOException {
         mockObjectMapper = mock(ObjectMapper.class);
-        testNeeds = new Need[3];
-        testNeeds[0] = new Need("one", 0, 100, Need.GoalType.MONETARY);
-		testNeeds[1] = new Need("two", 1, 100, Need.GoalType.MONETARY);
-		testNeeds[2] = new Need("three", 2, 100, Need.GoalType.MONETARY);
+        testNeeds = new Need[]{
+        	new Need("one", 0, 100, Need.GoalType.MONETARY),
+			new Need("two", 1, 100, Need.GoalType.MONETARY),
+			new Need("three", 2, 100, Need.GoalType.MONETARY)
+		};
         // When the object mapper is supposed to read from the file
         // the mock object mapper will return the hero array above
         when(mockObjectMapper
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserAuthFileDAOTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserAuthFileDAOTest.java
new file mode 100644
index 0000000..f7db747
--- /dev/null
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserAuthFileDAOTest.java
@@ -0,0 +1,63 @@
+package com.ufund.api.ufundapi.persistence;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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.fasterxml.jackson.databind.ObjectMapper;
+import com.ufund.api.ufundapi.model.UserAuth;
+
+@Tag("Persistence-tier")
+public class UserAuthFileDAOTest {
+
+    private UserAuthFIleDAO userAuthFIleDAO;
+    private ObjectMapper mockObjectMapper;
+    private UserAuth[] userAuths;
+
+    @BeforeEach
+    public void setupUserAuthFileDAO() throws IOException {
+
+        mockObjectMapper = mock(ObjectMapper.class);
+        userAuths = new UserAuth[]{
+        	new UserAuth("123", "Phil", null),
+            new UserAuth("456", "Bob", null),
+            new UserAuth("789", "Steve", null)
+		};
+        // When the object mapper is supposed to read from the file
+        // the mock object mapper will return the hero array above
+        when(mockObjectMapper
+            .readValue(new File("doesnt_matter.txt"),UserAuth[].class))
+                .thenReturn(userAuths);
+        userAuthFIleDAO = new UserAuthFIleDAO(mockObjectMapper, "doesnt_matter.txt");
+    }
+
+    @Test
+    public void getUserAuthTest() {
+        String key = "123";
+        UserAuth auth = userAuthFIleDAO.getUserAuth(key);
+
+        assertEquals(auth, userAuths[0]);
+    }
+
+    @Test
+    public void addUserAuthTest() throws IOException {
+        UserAuth auth = new UserAuth("999", "Fish", null);
+
+        assertDoesNotThrow(() -> userAuthFIleDAO.addUserAuth(auth));
+    }
+
+    @Test
+    public void removeUserAuthTest() throws IOException {
+        String key = "123";
+
+        assertDoesNotThrow(() -> userAuthFIleDAO.removeUserAuth(key));
+    }
+    
+}
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserFileDAOTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserFileDAOTest.java
index b802669..9361188 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserFileDAOTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserFileDAOTest.java
@@ -27,9 +27,9 @@ public class UserFileDAOTest {
     public void setupHeroFileDAO() throws IOException {
         mockObjectMapper = mock(ObjectMapper.class);
         testUsers = new User[3];
-        testUsers[0] = new User("bob");
-		testUsers[1] = new User("admin");
-		testUsers[2] = new User("jelly12");
+        testUsers[0] = User.create("bob", "pass");
+		testUsers[1] = User.create("admin", "pass");
+		testUsers[2] = User.create("jelly12", "pass");
 
         // When the object mapper is supposed to read from the file
         // the mock object mapper will return the hero array above
@@ -75,7 +75,7 @@ public class UserFileDAOTest {
 
 	@Test
 	public void createUserTest() throws IOException {
-		User newUser = new User("keshey");
+		User newUser = User.create("keshey", "pass");
 		userFileDAO.addUser(newUser);
 
 		User actualUser = userFileDAO.getUser("keshey");