First attempt at an authentication system.

3 files changed, 8 insertions, 8 deletions

diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/UserControllerTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/UserControllerTest.java
index 681f47c..496c68c 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/UserControllerTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/UserControllerTest.java
@@ -84,7 +84,7 @@ public class UserControllerTest {
         User user = new User(username);
         // when createUser is called, return true simulating successful
         // creation and save
-        when(mockUserDAO.createUser(user)).thenReturn(user);
+        when(mockUserDAO.addUser(user)).thenReturn(user);
 
         // Invoke
         ResponseEntity<User> response = userController.createUser(user);
@@ -101,7 +101,7 @@ public class UserControllerTest {
         User user = new User(username);
         // when createUser is called, return false simulating failed
         // creation and save
-        when(mockUserDAO.createUser(user)).thenReturn(null);
+        when(mockUserDAO.addUser(user)).thenReturn(null);
 
         // Invoke
         ResponseEntity<User> response = userController.createUser(user);
@@ -117,7 +117,7 @@ public class UserControllerTest {
         User user = new User(username);
 
         // When createUser is called on the Mock User DAO, throw an IOException
-        doThrow(new IOException()).when(mockUserDAO).createUser(user);
+        doThrow(new IOException()).when(mockUserDAO).addUser(user);
 
         // Invoke
         ResponseEntity<User> response = userController.createUser(user);
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
index 8b8dd99..8cc0900 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
@@ -26,7 +26,7 @@ public class UserTest {
 
         User user = new User(expectedName);
 
-        assertEquals(expectedName, user.getName());
+        assertEquals(expectedName, user.getUsername());
 
     }
 
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..52a1fdc 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
@@ -50,7 +50,7 @@ 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())) {
+				if (users[i].getUsername().equals(user.getUsername())) {
 					isInArray = true;
 				}
 			}
@@ -77,12 +77,12 @@ public class UserFileDAOTest {
 	@Test
 	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
@@ -106,7 +106,7 @@ public class UserFileDAOTest {
 
 		updatedUser = userFileDAO.updateUser(updatedUser, "admin");
 		assertNotEquals(toBeUpdatedUser, updatedUser);
-		assertEquals("jellinadmin", updatedUser.getName());
+		assertEquals("jellinadmin", updatedUser.getUsername());
 	}
 
 }