Merge remote-tracking branch 'refs/remotes/origin/main' into funding_basket

# Conflicts:
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.ts

1 files changed, 37 insertions, 13 deletions

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..54aa4d1 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,19 +1,34 @@
 package com.ufund.api.ufundapi.model;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 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 org.junit.jupiter.api.BeforeEach;
+import static org.mockito.Mockito.when;
+
+import com.ufund.api.ufundapi.service.CupboardService;
+
 @Tag("Model-tier")
 public class UserTest {
 
+    private CupboardService cupboardService;
+
+    @BeforeEach
+    public void setup() {
+        cupboardService = mock(CupboardService.class);
+    }
+
     @Test
     public void createUser() {
 
         String name = "Bob";
 
-        User user = new User(name);
+        User user = User.create(name, "pass");
 
         assertNotNull(user);
 
@@ -23,42 +38,51 @@ 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());
 
     }
 
     @Test
-    public void addNeedToBasket() {
+    public void addNeedToBasket() throws IOException {
 
         String expectedName = "Bob";
 
-        User user = new User(expectedName);
+        User user = User.create(expectedName, "pass");
         Need need = new Need("Test", 0, 100, Need.GoalType.MONETARY);
         Need[] needs = { need };
 
+        when(cupboardService.getNeed(0)).thenReturn(need);
+
         user.addToBasket(need);
 
-        assertEquals(needs[0], user.getBasketNeeds()[0]);
+        Need getNeed = cupboardService.getNeed(user.getBasketNeeds()[0]);
+
+        assertEquals(needs[0], getNeed);
 
     }
 
     @Test
-    public void testRemoveBasketNeed() {
+    public void testRemoveBasketNeed() throws IOException {
 
         String expectedName = "Bob";
 
-        User user = new User(expectedName);
+        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);
 
+        when(cupboardService.getNeed(0)).thenReturn(need2);
+
         user.addToBasket(need);
         user.removeBasketNeed(need);
         user.addToBasket(need2);
 
-        assertEquals(need2, user.getBasketNeeds()[0]);
+        Need getNeed = cupboardService.getNeed(user.getBasketNeeds()[0]);
+
+        assertEquals(need2, getNeed);
 
     }
 
@@ -67,9 +91,9 @@ public class UserTest {
 
         String expectedName = "Bob";
 
-        User user = new User(expectedName);
+        User user = User.create(expectedName, "pass");
 
-        assertEquals(false, user.verifyPassword(expectedName));
+        assertFalse(user.verifyPassword(expectedName));
 
     }