aboutsummaryrefslogtreecommitdiff
path: root/ufund-api/src/test/java/com/ufund/api/ufundapi/persistence
diff options
context:
space:
mode:
Diffstat (limited to 'ufund-api/src/test/java/com/ufund/api/ufundapi/persistence')
-rw-r--r--ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/CupboardFileDAOTest.java (renamed from ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/CupboardFileDaoTest.java)58
-rw-r--r--ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserAuthFileDAOTest.java63
-rw-r--r--ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserFileDAOTest.java51
3 files changed, 110 insertions, 62 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 8aa6fe0..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
@@ -1,79 +1,65 @@
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.Need;
-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;
-
import com.ufund.api.ufundapi.model.Need.GoalType;
@Tag("Persistence-tier")
-public class CupboardFileDaoTest {
- CupboardFileDao cupboardFileDao;
- Need[] testNeeds;
- ObjectMapper mockObjectMapper;
+public class CupboardFileDAOTest {
+ 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
.readValue(new File("doesnt_matter.txt"),Need[].class))
.thenReturn(testNeeds);
- cupboardFileDao = new CupboardFileDao("doesnt_matter.txt",mockObjectMapper);
+ cupboardFileDao = new CupboardFileDAO("doesnt_matter.txt",mockObjectMapper);
}
@Test
- public void GetNeedsTest() throws IOException {
+ public void getNeedsTest() {
Need[] needs = cupboardFileDao.getNeeds();
assertEquals(needs.length,testNeeds.length);
assertEquals(needs[0].getName(), testNeeds[0].getName());
}
@Test
- public void GetNeedTest() throws IOException {
+ public void getNeedTest() {
Need need1 = cupboardFileDao.getNeed(0);
assertEquals(testNeeds[0], need1);
}
@Test
- public void Fet() throws IOException {
- String targetName1 = "one";
- String targetName2 = "two";
-
- Need need1 = cupboardFileDao.findNeeds(targetName1)[0];
- Need need2 = cupboardFileDao.findNeeds(targetName2)[0];
-
- assertEquals(testNeeds[0], need1);
- assertEquals(testNeeds[1], need2);
- }
-
- @Test
- public void CreateNeedTest() throws IOException {
+ public void createNeedTest() throws IOException {
Need newNeed = new Need("sea urchin hats", 3, 100, GoalType.PHYSICAL);
- Need actualNeed = cupboardFileDao.createNeed(newNeed);
+ Need actualNeed = cupboardFileDao.addNeed(newNeed);
assertNotNull(actualNeed);
@@ -81,7 +67,7 @@ public class CupboardFileDaoTest {
}
@Test
- public void DeleteNeedTest() throws IOException {
+ public void deleteNeedTest() throws IOException {
Need undeletedNeed = cupboardFileDao.getNeed(0);
assertNotNull(undeletedNeed);
@@ -93,7 +79,7 @@ public class CupboardFileDaoTest {
}
@Test
- public void UpdateNeedTest() throws IOException {
+ public void updateNeedTest() throws IOException {
Need[] needs = cupboardFileDao.getNeeds();
Need unupdatedNeed = needs[needs.length - 1];
assertNotNull(unupdatedNeed);
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 dfe9b10..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
@@ -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;
@@ -29,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
@@ -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 {
- User newUser = new User("keshey");
- userFileDAO.createUser(newUser);
+ public void createUserTest() throws IOException {
+ User newUser = User.create("keshey", "pass");
+ 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());
}
}