aboutsummaryrefslogtreecommitdiff
path: root/ufund-api/src/test/java/com/ufund
diff options
context:
space:
mode:
Diffstat (limited to 'ufund-api/src/test/java/com/ufund')
-rw-r--r--ufund-api/src/test/java/com/ufund/api/ufundapi/controller/UserControllerTest.java30
-rw-r--r--ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java5
-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)7
-rw-r--r--ufund-api/src/test/java/com/ufund/api/ufundapi/persistence/UserFileDAOTest.java8
4 files changed, 31 insertions, 19 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..d189836 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
@@ -1,6 +1,7 @@
package com.ufund.api.ufundapi.controller;
import java.io.IOException;
+import java.util.HashMap;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.BeforeEach;
@@ -13,18 +14,21 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import com.ufund.api.ufundapi.model.User;
+import com.ufund.api.ufundapi.model.UserAuth;
+import com.ufund.api.ufundapi.persistence.UserAuthFIleDAO;
import com.ufund.api.ufundapi.persistence.UserFileDAO;
@Tag("Controller-tier")
public class UserControllerTest {
private UserController userController;
private UserFileDAO mockUserDAO;
+ private UserAuthFIleDAO mockAuthUserDAO;
@BeforeEach
public void setupUserController() {
mockUserDAO = mock(UserFileDAO.class);
- userController = new UserController(mockUserDAO);
-
+ mockAuthUserDAO = mock(UserAuthFIleDAO.class);
+ userController = new UserController(mockUserDAO, mockAuthUserDAO);
}
@Test
@@ -32,11 +36,13 @@ public class UserControllerTest {
// Setup
String username = "Test";
User user = new User(username);
+ String key = UserAuth.generate(username).getKey();
// When the same id is passed in, our mock User DAO will return the User object
when(mockUserDAO.getUser(username)).thenReturn(user);
+
// Invoke
- ResponseEntity<User> response = userController.getUser(username);
+ ResponseEntity<User> response = userController.getUser(username, key);
// Analyze
assertEquals(HttpStatus.OK, response.getStatusCode());
@@ -47,12 +53,14 @@ public class UserControllerTest {
public void testGetUserNotFound() throws Exception { // createUser may throw IOException
// Setup
String username = "Test";
+ String key = UserAuth.generate(username).getKey();
// When the same id is passed in, our mock User DAO will return null, simulating
// no User found
when(mockUserDAO.getUser(username)).thenReturn(null);
+
// Invoke
- ResponseEntity<User> response = userController.getUser(username);
+ ResponseEntity<User> response = userController.getUser(username, key);
// Analyze
assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
@@ -62,11 +70,12 @@ public class UserControllerTest {
public void testGetUserHandleException() throws Exception { // createUser may throw IOException
// Setup
String username = "Test";
+ String key = UserAuth.generate(username).getKey();
// When getUser is called on the Mock User DAO, throw an IOException
doThrow(new IOException()).when(mockUserDAO).getUser(username);
// Invoke
- ResponseEntity<User> response = userController.getUser(username);
+ ResponseEntity<User> response = userController.getUser(username, key);
// Analyze
assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
@@ -82,12 +91,15 @@ public class UserControllerTest {
// Setup
String username = "Test";
User user = new User(username);
+ String key = UserAuth.generate(username).getKey();
// 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);
+ ResponseEntity<User> response = userController.createUser(params);
// Analyze
assertEquals(HttpStatus.CREATED, response.getStatusCode());
@@ -101,7 +113,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 +129,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 716fbfd..22f6ffb 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
@@ -23,10 +23,11 @@ public class UserTest {
public void testUsername() {
String expectedName = "Bob";
+ String password = "password";
- User user = new User(expectedName);
+ User user = User.create(expectedName, password);
- assertEquals(expectedName, user.getName());
+ assertEquals(expectedName, user.getUsername());
}
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..e554f9d 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
@@ -13,7 +13,6 @@ 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;
@@ -22,8 +21,8 @@ import org.junit.jupiter.api.Test;
import com.ufund.api.ufundapi.model.Need.GoalType;
@Tag("Persistence-tier")
-public class CupboardFileDaoTest {
- CupboardFileDao cupboardFileDao;
+public class CupboardFileDAOTest {
+ CupboardFileDAO cupboardFileDao;
Need[] testNeeds;
ObjectMapper mockObjectMapper;
@@ -39,7 +38,7 @@ public class CupboardFileDaoTest {
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
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());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 13:40:55 +0000