Fixed broken tests and made them more consistent

5 files changed, 165 insertions, 89 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 89697bf..31e085b 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
@@ -38,16 +38,20 @@ public class CupboardControllerTest {
     @Test
     public void createNeed() throws IOException, DuplicateKeyException {
         String name = "Test";
+        String location = "Atlantis";
         int maxGoal = 100;
         GoalType type = Need.GoalType.MONETARY;
-        var need = new Need(name, type, maxGoal);
-        when(mockCupboardService.createNeed(name, maxGoal, type)).thenReturn(need);
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
+        when(mockCupboardService.createNeed(name, "Atlantis", maxGoal, type, false)).thenReturn(need);
 
 
         Map<String, Object> needMap = Map.ofEntries(
                 entry("name", "Test"),
+                entry("location", "Atlantis"),
                 entry("maxGoal", 100.0),
-                entry("type", "MONETARY")
+                entry("type", "MONETARY"),
+                entry("urgent", false)
         );
 
         var res = cupboardController.createNeed(needMap, key);
@@ -58,12 +62,15 @@ public class CupboardControllerTest {
 
     @Test
     public void createNeedBadMaxGoal() throws IOException, DuplicateKeyException {
-        when(mockCupboardService.createNeed("Name", -100, Need.GoalType.MONETARY)).thenThrow(new IllegalArgumentException());
+        when(mockCupboardService.createNeed("Test", "Atlantis", -100, Need.GoalType.MONETARY, false)).thenThrow(new IllegalArgumentException());
 
         Map<String, Object> needMap = Map.ofEntries(
-                entry("name", "Name"),
-                entry("maxGoal", -100.0),
-                entry("type", "MONETARY"));
+                entry("name", "Test"),
+                entry("location", "Atlantis"),
+                entry("maxGoal", -100),
+                entry("type", "MONETARY"),
+                entry("urgent", false)
+        );
 
         var res = cupboardController.createNeed(needMap, key);
 
@@ -72,12 +79,15 @@ public class CupboardControllerTest {
 
     @Test
     public void createNeedIOException() throws IOException, DuplicateKeyException {
-        when(mockCupboardService.createNeed("Name", 100, Need.GoalType.MONETARY)).thenThrow(new IOException());
+        when(mockCupboardService.createNeed("Test", "Atlantis", 100, Need.GoalType.MONETARY, false)).thenThrow(new IOException());
 
         Map<String, Object> needMap = Map.ofEntries(
-                entry("name", "Name"),
-                entry("maxGoal", 100.0),
-                entry("type", "MONETARY"));
+                entry("name", "Test"),
+                entry("location", "Atlantis"),
+                entry("maxGoal", 100),
+                entry("type", "MONETARY"),
+                entry("urgent", false)
+        );
 
         var res = cupboardController.createNeed(needMap, key);
 
@@ -86,7 +96,12 @@ public class CupboardControllerTest {
 
     @Test
     public void getNeeds() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.getNeeds()).thenReturn(new Need[]{need});
 
         var res = cupboardController.getNeeds();
@@ -116,7 +131,12 @@ public class CupboardControllerTest {
 
     @Test
     public void searchNeeds() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.searchNeeds("Na")).thenReturn(new Need[]{need});
 
         var res = cupboardController.searchNeeds("Na");
@@ -146,7 +166,12 @@ public class CupboardControllerTest {
 
     @Test
     public void getNeed() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.getNeed(need.getId())).thenReturn(need);
 
         var res = cupboardController.getNeed(need.getId());
@@ -157,7 +182,12 @@ public class CupboardControllerTest {
 
     @Test
     public void getNeedIOException() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.getNeed(need.getId())).thenThrow(new IOException());
 
         var res = cupboardController.getNeed(need.getId());
@@ -167,7 +197,12 @@ public class CupboardControllerTest {
 
     @Test
     public void getNeedFail() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.getNeed(need.getId())).thenReturn(null);
 
         var res = cupboardController.getNeed(need.getId());
@@ -178,7 +213,12 @@ public class CupboardControllerTest {
 
     @Test
     public void updateNeeds() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.updateNeed(need, 1)).thenReturn(need);
 
         var res = cupboardController.updateNeed(need, 1, key);
@@ -189,7 +229,12 @@ public class CupboardControllerTest {
 
     @Test
     public void updateNeedsIOException() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.updateNeed(need, 1)).thenThrow(new IOException());
 
         var res = cupboardController.updateNeed(need, 1, key);
@@ -199,7 +244,12 @@ public class CupboardControllerTest {
 
     @Test
     public void deleteNeed() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.getNeed(1)).thenReturn(need);
         when(mockCupboardService.deleteNeed(1)).thenReturn(true);
 
@@ -220,7 +270,12 @@ public class CupboardControllerTest {
 
     @Test
     public void deleteNeedIOException() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
+        String name = "Test";
+        String location = "Atlantis";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         when(mockCupboardService.getNeed(1)).thenReturn(need);
         when(mockCupboardService.deleteNeed(1)).thenThrow(new IOException());
 
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java
index 6b4ddfc..c7d17c7 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java
@@ -14,23 +14,26 @@ public class NeedTest {
     public void createNeed() {
 
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         assertNotNull(need);
     }
 
     @Test
     public void testFields() {
         String name = "Jellyfish";
-        int id = 0;
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
        
         assertEquals(name, need.getName());
-        assertEquals(id, need.getId());
+        assertEquals(0, need.getId());
         assertEquals(maxGoal, need.getMaxGoal());
         assertEquals(type, need.getType());
     }
@@ -38,9 +41,11 @@ public class NeedTest {
     @Test
     public void testCurrentGoal() {
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
         double current = 0.00;
         need.setCurrent(current);
@@ -60,9 +65,11 @@ public class NeedTest {
     public void testFilterAttributes() {
 
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
         String[] filterAttributes = {"seaweed", "divers", "pacific", "plankton"};
 
@@ -75,9 +82,11 @@ public class NeedTest {
     public void testSetMaxGoal() {
 
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
         double newGoal = 200.00;
         need.setMaxGoal(newGoal);
@@ -90,9 +99,11 @@ public class NeedTest {
     public void testSetName() {
 
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
         String newName = "TESTINGFUN";
         need.setName(newName);
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 517a7e2..01b558c 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
@@ -52,7 +52,7 @@ public class UserTest {
         String expectedName = "Bob";
 
         User user = User.create(expectedName, "pass");
-        Need need = new Need("Test", 0, 100, Need.GoalType.MONETARY);
+        Need need = new Need("Test", "Atlantis", 0, 100, Need.GoalType.MONETARY, false);
         Need[] needs = { need };
 
         when(cupboardService.getNeed(0)).thenReturn(need);
@@ -71,9 +71,8 @@ public class UserTest {
         String expectedName = "Bob";
 
         User user = User.create(expectedName, "pass");
-        Need need = new Need("Test", 0, 100, Need.GoalType.MONETARY);
-        Need need2 = new Need("Test2", 0, 100, Need.GoalType.MONETARY);
-
+        Need need = new Need("Test", "Atlantis", 0, 100, Need.GoalType.MONETARY, false);
+        Need need2 = new Need("Test2", "Atlantis", 0, 100, Need.GoalType.MONETARY, false);
         when(cupboardService.getNeed(0)).thenReturn(need2);
 
         user.addToBasket(need);
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 d83e825..acb759a 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
@@ -28,15 +28,13 @@ public class CupboardFileDAOTest {
 	public void setupCupboardFileDao() throws IOException {
         ObjectMapper mockObjectMapper = mock(ObjectMapper.class);
 		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)
+				new Need("one", "Atlantis", 0, 100, Need.GoalType.MONETARY, false),
+				new Need("two", "Atlantis", 1, 100, Need.GoalType.MONETARY, false),
+				new Need("three", "Atlantis", 2, 100, Need.GoalType.MONETARY, false)
 		};
 		// 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);
+		when(mockObjectMapper.readValue(new File("doesnt_matter.txt"), Need[].class)).thenReturn(testNeeds);
 		cupboardFileDao = new CupboardFileDAO("doesnt_matter.txt", mockObjectMapper);
 	}
 
@@ -56,7 +54,7 @@ public class CupboardFileDAOTest {
 
 	@Test
 	public void createNeedTest() throws IOException {
-		Need newNeed = new Need("sea urchin hats", 3, 100, GoalType.PHYSICAL);
+		Need newNeed = new Need("sea urchin hats", "Atlantis", 100, GoalType.PHYSICAL, false);
 
 		Need actualNeed = cupboardFileDao.addNeed(newNeed);
 
@@ -92,7 +90,7 @@ public class CupboardFileDAOTest {
 		Need unupdatedNeed = needs[needs.length - 1];
 		assertNotNull(unupdatedNeed);
 
-		Need updatedNeed = new Need("sequin sea urchin hats", 2, 100, GoalType.PHYSICAL);
+		Need updatedNeed = new Need("sequin sea urchin hats", "Atlantis", 100, GoalType.PHYSICAL, false);
 
 		Need actualNeed = cupboardFileDao.updateNeed(updatedNeed);
 		assertEquals(actualNeed, updatedNeed);
@@ -105,7 +103,7 @@ public class CupboardFileDAOTest {
 		Need unupdatedNeed = needs[needs.length - 1];
 		assertNotNull(unupdatedNeed);
 
-		Need updatedNeed = new Need("sequin sea urchin hats", 20, 100, GoalType.PHYSICAL);
+		Need updatedNeed = new Need("sequin sea urchin hats", "Atlantis", 5, 100, GoalType.PHYSICAL, false);
 
 		Need actualNeed = cupboardFileDao.updateNeed(updatedNeed);
 		assertNull(actualNeed);
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/CupboardServiceTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/CupboardServiceTest.java
index 05ea2e8..f3cbc23 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/CupboardServiceTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/CupboardServiceTest.java
@@ -36,16 +36,18 @@ public class CupboardServiceTest {
     public void testCreateNeed() throws IOException, DuplicateKeyException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
         // When the same id is passed in, our mock User DAO will return the User object
         when(mockCupboardDAO.addNeed(any())).thenReturn(need);
         when(mockCupboardDAO.getNeeds()).thenReturn(new Need[0]);
 
         // Invoke
-        Need response = cupboardService.createNeed(name, maxGoal, type);
+        Need response = cupboardService.createNeed(name, location, maxGoal, type, urgent);
 
         // Analyze
         assertNotNull(response);
@@ -56,9 +58,11 @@ public class CupboardServiceTest {
     public void testCreateNeedBadGoal() throws IOException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = -100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = -100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
         // When the same id is passed in, our mock User DAO will return the User object
         when(mockCupboardDAO.addNeed(any())).thenReturn(need);
@@ -69,16 +73,18 @@ public class CupboardServiceTest {
 
         // Analyze
         assertThrows(IllegalArgumentException.class, () ->
-                cupboardService.createNeed(name, maxGoal, type));
+                cupboardService.createNeed(name, location, maxGoal, type, urgent));
     }
 
     @Test
     public void testCreateNeedDuplicate() throws IOException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         Need[] needs = { need };
 
         // When the same id is passed in, our mock User DAO will return the User object
@@ -90,16 +96,18 @@ public class CupboardServiceTest {
 
         // Analyze
         assertThrows(DuplicateKeyException.class, () ->
-                cupboardService.createNeed(name, maxGoal, type));
+                cupboardService.createNeed(name, location, maxGoal, type, urgent));
     }
 
     @Test
     public void testSearchNeeds() throws IOException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         Need[] needs = { need };
 
         // When the same id is passed in, our mock User DAO will return the User object
@@ -117,9 +125,11 @@ public class CupboardServiceTest {
     public void testSearchNeedsFail() throws IOException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
         Need[] needs = { need };
 
         // When the same id is passed in, our mock User DAO will return the User object
@@ -136,16 +146,17 @@ public class CupboardServiceTest {
     public void testGetNeed() throws IOException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        int id = 0;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        var need = new Need(name, location, maxGoal, type, urgent);
 
         // When the same id is passed in, our mock User DAO will return the User object
-        when(mockCupboardDAO.getNeed(id)).thenReturn(need);
+        when(mockCupboardDAO.getNeed(0)).thenReturn(need);
 
         // Invoke
-        Need response = cupboardService.getNeed(id);
+        Need response = cupboardService.getNeed(need.getId());
 
         // Analyze
         assertEquals(need, response);
@@ -155,17 +166,18 @@ public class CupboardServiceTest {
     public void testUpdateNeed() throws IOException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        int id = 0;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
-        Need newNeed = new Need("Octopus", type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        Need need = new Need(name, location, maxGoal, type, urgent);
+        Need newNeed = new Need("Octopus", location, maxGoal, type, urgent);
 
         // When the same id is passed in, our mock User DAO will return the User object
         when(mockCupboardDAO.updateNeed(any())).thenReturn(newNeed);
 
         // Invoke
-        Need response = cupboardService.updateNeed(newNeed, id);
+        Need response = cupboardService.updateNeed(newNeed, need.getId());
 
         // Analyze
         assertEquals(newNeed, response);
@@ -175,17 +187,18 @@ public class CupboardServiceTest {
     public void testDeleteNeed() throws IOException {
         // Setup
         String name = "Jellyfish";
-        double maxGoal = 100.00;
-        int id = 0;
-        GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, type, maxGoal);
+        String location = "Atlantis";
+        double maxGoal = 100.0;
+        GoalType type = Need.GoalType.MONETARY;
+        boolean urgent = false;
+        Need need = new Need(name, location, maxGoal, type, urgent);
 
         // When the same id is passed in, our mock User DAO will return the User object
-        when(mockCupboardDAO.deleteNeed(id)).thenReturn(true);
+        when(mockCupboardDAO.deleteNeed(0)).thenReturn(true);
         when(mockCupboardDAO.getNeeds()).thenReturn(new Need[0]);
 
         // Invoke
-        boolean response = cupboardService.deleteNeed(id);
+        boolean response = cupboardService.deleteNeed(need.getId());
         Need[] responseNeeds = cupboardService.getNeeds();
 
         // Analyze