1 files changed, 21 insertions, 22 deletions

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 dfe9b10..b802669 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
@@ -1,24 +1,22 @@
 package com.ufund.api.ufundapi.persistence;
 
+import java.io.File;
+import java.io.IOException;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+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 java.io.File;
-import java.io.IOException;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.ufund.api.ufundapi.model.User;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
 @Tag("Persistence-tier")
 public class UserFileDAOTest {
     UserFileDAO userFileDAO;
@@ -42,7 +40,7 @@ public class UserFileDAOTest {
     }
 
     @Test
-    public void GetUsersTest() throws IOException {
+    public void getUsersTest() {
         User[] users = userFileDAO.getUsers();
 
         assertEquals(users.length,testUsers.length);
@@ -50,16 +48,17 @@ public class UserFileDAOTest {
         for (int i = 0; i < testUsers.length;++i) {
 			boolean isInArray = false;
             for (User user : testUsers) {
-				if (users[i].getName().equals(user.getName())) {
-					isInArray = true;
-				}
+                if (users[i].getUsername().equals(user.getUsername())) {
+                    isInArray = true;
+                    break;
+                }
 			}
 			assertTrue(isInArray);
 		}
     }
 
     @Test
-    public void FindUsersTest() throws IOException {
+    public void findUsersTest() {
 		User realUser1 = userFileDAO.getUser("bob");
 		User realUser2 = userFileDAO.getUser("admin");
 
@@ -68,25 +67,25 @@ public class UserFileDAOTest {
     }
 
 	@Test
-    public void FindUsersNullTest() throws IOException {
+    public void findUsersNullTest() {
 		User fakeUser = userFileDAO.getUser("phil.n.thropist");
 
 		assertNull(fakeUser);
     }
 
 	@Test
-	public void CreateUserTest() throws IOException {
+	public void createUserTest() throws IOException {
 		User newUser = new User("keshey");
-		userFileDAO.createUser(newUser);
+		userFileDAO.addUser(newUser);
 
 		User actualUser = userFileDAO.getUser("keshey");
 		assertNotNull(actualUser);
 
-		assertEquals(actualUser.getName(), newUser.getName());
+		assertEquals(actualUser.getUsername(), newUser.getUsername());
 	}
 
 	@Test
-	public void DeleteUserTest() throws IOException {
+	public void deleteUserTest() throws IOException {
 		User notDeletedUser = userFileDAO.getUser("jelly12");
 		assertNotNull(notDeletedUser);
 
@@ -98,15 +97,15 @@ public class UserFileDAOTest {
 	}
 
 	@Test
-	public void UpdateUserTest() throws IOException {
+	public void updateUserTest() throws IOException {
 		User toBeUpdatedUser = userFileDAO.getUser("admin");
 		assertNotNull(toBeUpdatedUser);
 
-		User updatedUser = new User("jellinadmin");
+		User updatedUser = User.create("admin", "newPass");
 
-		updatedUser = userFileDAO.updateUser(updatedUser, "admin");
+		updatedUser = userFileDAO.updateUser(updatedUser);
 		assertNotEquals(toBeUpdatedUser, updatedUser);
-		assertEquals("jellinadmin", updatedUser.getName());
+		assertEquals("admin", updatedUser.getUsername());
 	}
 
 }