From e2c058c91666199e091bd32db7728aac10bb6d23 Mon Sep 17 00:00:00 2001 From: Gunther6070 Date: Tue, 18 Mar 2025 15:33:17 -0400 Subject: Fixed broken test --- .../test/java/com/ufund/api/ufundapi/model/UserTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ufund-api/src/test/java/com') 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..745e382 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; @@ -77,7 +77,7 @@ 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]); -- cgit v1.2.3 From ee8d4db34e95095793e27c53d8d4033ab2496fed Mon Sep 17 00:00:00 2001 From: Gunther6070 Date: Tue, 18 Mar 2025 15:33:34 -0400 Subject: Added missing mock to fix tests --- .../src/test/java/com/ufund/api/ufundapi/service/UserServiceTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ufund-api/src/test/java/com') 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 -- cgit v1.2.3 From 81b93fc671ba35d67c414937e18b686fd6d5f861 Mon Sep 17 00:00:00 2001 From: Akash Keshav <112591754+domesticchores@users.noreply.github.com> Date: Tue, 18 Mar 2025 16:53:39 -0400 Subject: idk but it works. funding basket worsk. -ak --- ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ufund-api/src/test/java/com') 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 745e382..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 @@ -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); @@ -80,7 +80,7 @@ public class UserTest { user.removeBasketNeed(need.getId()); user.addToBasket(need2); - Need getNeed = cupboardService.getNeed(user.getBasketNeeds()[0]); + Need getNeed = cupboardService.getNeed(user.getNeeds()[0]); assertEquals(need2, getNeed); -- cgit v1.2.3 From de2913a773510139334fd9d24318ce2aa2676e3c Mon Sep 17 00:00:00 2001 From: Gunther6070 Date: Tue, 18 Mar 2025 17:08:25 -0400 Subject: Fixed broken tests --- .../com/ufund/api/ufundapi/controller/CupboardControllerTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ufund-api/src/test/java/com') 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 needMap = Map.ofEntries( entry("name", "Test"), - entry("maxGoal", 100), + entry("maxGoal", 100.0), entry("type", "MONETARY") ); @@ -55,12 +55,12 @@ public class CupboardControllerTest { Map 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 needMap = Map.ofEntries( entry("name", "Name"), - entry("maxGoal", 100), + entry("maxGoal", 100.0), entry("type", "MONETARY")); var res = cupboardController.createNeed(needMap); -- cgit v1.2.3 From 9044bbbff92618990fa4a4bd82cfcc96781da526 Mon Sep 17 00:00:00 2001 From: Gunther6070 Date: Tue, 18 Mar 2025 17:08:37 -0400 Subject: Fixed imports --- .../test/java/com/ufund/api/ufundapi/controller/UserControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ufund-api/src/test/java/com') 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 response = userController.updateUser(user, username, key); -- cgit v1.2.3