Merge remote-tracking branch 'origin/main' into cupboard-component

# Conflicts:
#	ufund-api/data/cupboard.json
#	ufund-ui/src/app/app.module.ts

1 files changed, 35 insertions, 6 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 8b8dd99..5e017dd 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,10 +1,10 @@
 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.*;
+
 @Tag("Model-tier")
 public class UserTest {
 
@@ -13,7 +13,7 @@ public class UserTest {
 
         String name = "Bob";
 
-        User user = new User(name);
+        User user = User.create(name, "pass");
 
         assertNotNull(user);
 
@@ -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());
 
     }
 
@@ -35,7 +36,7 @@ public class UserTest {
 
         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 };
 
@@ -45,4 +46,32 @@ public class UserTest {
 
     }
 
+    @Test
+    public void testRemoveBasketNeed() {
+
+        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);
+
+        user.addToBasket(need);
+        user.removeBasketNeed(need);
+        user.addToBasket(need2);
+
+        assertEquals(need2, user.getBasketNeeds()[0]);
+
+    }
+
+    @Test
+    public void testVerifyPassword() {
+
+        String expectedName = "Bob";
+
+        User user = User.create(expectedName, "pass");
+
+        assertFalse(user.verifyPassword(expectedName));
+
+    }
+
 }