Merge pull request #14 from RIT-SWEN-261-02/funding_basketv2.1

funding-basket merge

1 files changed, 9 insertions, 9 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 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);