diff options
Diffstat (limited to 'ufund-api/src/test/java/com/ufund/api')
4 files changed, 17 insertions, 15 deletions
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java index 94f93cb..6ef6710 100644 --- a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java +++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java @@ -39,7 +39,7 @@ public class CupboardControllerTest { Map<String, Object> needMap = Map.ofEntries( entry("name", "Test"), - entry("maxGoal", 100), + entry("maxGoal", 100.0), entry("type", "MONETARY") ); @@ -55,12 +55,12 @@ public class CupboardControllerTest { Map<String, Object> needMap = Map.ofEntries( entry("name", "Name"), - entry("maxGoal", -100), + entry("maxGoal", -100.0), entry("type", "MONETARY")); var res = cupboardController.createNeed(needMap); - assertEquals(HttpStatus.UNPROCESSABLE_ENTITY, res.getStatusCode()); + assertEquals(HttpStatus.BAD_REQUEST, res.getStatusCode()); } @Test @@ -69,7 +69,7 @@ public class CupboardControllerTest { Map<String, Object> needMap = Map.ofEntries( entry("name", "Name"), - entry("maxGoal", 100), + entry("maxGoal", 100.0), entry("type", "MONETARY")); var res = cupboardController.createNeed(needMap); 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 b6367ad..cc7df40 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,7 +1,6 @@ package com.ufund.api.ufundapi.controller; import java.io.IOException; -import java.security.InvalidParameterException; import java.util.Map; import static java.util.Map.entry; @@ -239,6 +238,7 @@ public class UserControllerTest { // When updateUser is called on the Mock User service, throw a Invalid Parameter exception // exception doThrow(new IllegalAccessException()).when(mockAuthService).authenticate(username, key); + // Invoke ResponseEntity<User> response = userController.updateUser(user, username, key); 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 54aa4d1..55b7f07 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 @@ -1,14 +1,14 @@ package com.ufund.api.ufundapi.model; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mock; - import java.io.IOException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; 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.ufund.api.ufundapi.service.CupboardService; @@ -59,7 +59,7 @@ public class UserTest { user.addToBasket(need); - Need getNeed = cupboardService.getNeed(user.getBasketNeeds()[0]); + Need getNeed = cupboardService.getNeed(user.getNeeds()[0]); assertEquals(needs[0], getNeed); @@ -77,10 +77,10 @@ public class UserTest { when(cupboardService.getNeed(0)).thenReturn(need2); user.addToBasket(need); - user.removeBasketNeed(need); + user.removeBasketNeed(need.getId()); user.addToBasket(need2); - Need getNeed = cupboardService.getNeed(user.getBasketNeeds()[0]); + Need getNeed = cupboardService.getNeed(user.getNeeds()[0]); assertEquals(need2, getNeed); diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/UserServiceTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/UserServiceTest.java index 0a0cb71..e57c5a3 100644 --- a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/UserServiceTest.java +++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/UserServiceTest.java @@ -19,12 +19,14 @@ public class UserServiceTest { private UserService userService; private UserDAO mockUserDAO; + private CupboardService mockCupboardService; @BeforeEach public void setupUserService() { mockUserDAO = mock(UserDAO.class); - userService = new UserService(mockUserDAO); + mockCupboardService = mock(CupboardService.class); + userService = new UserService(mockUserDAO, mockCupboardService); } @Test |