14 fixed

ucsd-cse110-fa23 · Dec 6, 2023 · a0111b6 · a0111b6
1 parent 6793a57
commit a0111b6
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 22 deletions.
diff --git a/app/src/test/java/cse/gradle/Feature14Tests.java b/app/src/test/java/cse/gradle/Feature14Tests.java
@@ -18,17 +18,23 @@
 import java.util.List;
 
 
-class Feature14Tests extends HTTPServerTests{
+class Feature14Tests extends HTTPServerTests {
     /* --------------------------------- UNIT TESTS --------------------------------- */
-    @Test 
-    void checkLoginError() {
-        Server.stopServer();
+    @Test
+    void editingTypeTags() {
+        Recipe r1 = new Recipe("eggs, bacon", "cook for 10 minutes", "breakfast", "American breakfast");
+        Recipe r2 = new Recipe("salmon, salad", "cook for 20 minutes", "lunch", "Healthy Lunch");
+        Recipe r3 = new Recipe("potatoes", "boil the potatoes", "dinner", "boiled potatoes");
+        List<Recipe> rList = new ArrayList<>();
+        rList.add(r1);
+        rList.add(r2);
+        rList.add(r3);
 
-        Model model = new MockModel();
-        String response = model.performLoginRequest("test_user", "password");
-        String error = "Error: Server down";
-        assertEquals(error, response);
+        assertEquals(rList.get(0).getCategory(), "breakfast");
+        assertEquals(rList.get(1).getCategory(), "lunch");
+        assertEquals(rList.get(2).getCategory(), "dinner");
     }
+
 
     /* --------------------------------- BDD TESTS --------------------------------- */
     @Test
@@ -47,18 +53,5 @@ void manipulatingTypeTagsInView() {
         assertEquals(rList1.get(0).getCategory(), "breakfast");
         assertEquals(rList1.get(1).getCategory(), "lunch");
         assertEquals(rList1.get(2).getCategory(), "dinner");
-    @Test 
-    void completeServerErrorTest() {
-        // login with test user
-        Model model = new MockModel();
-        String retrievedUserId = model.performLoginRequest("test_user", "password");
-        assertEquals(MockModel.mockUserId, retrievedUserId);
-
-        // cut connection and ask for recipe
-        Server.stopServer();
-        Recipe originalRecipe = new Recipe("potatoes", "boil the potatoes", "brunch", "boiled potatoes");
-        String response = model.postRecipe(originalRecipe);
-        String error = "Error: Server down";
-        assertEquals(error, response);
     }
-}
+}
diff --git a/app/src/test/java/cse/gradle/Feature20Tests.java b/app/src/test/java/cse/gradle/Feature20Tests.java
@@ -11,6 +11,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import cse.gradle.Server.Server;
+
 public class Feature20Tests extends HTTPServerTests{
     /*
      * --------------------------------- UNIT TESTS ---------------------------------
@@ -24,4 +26,30 @@ public void testLoginEndpoint() {
         assertEquals(MockModel.mockUserId, retrievedUserId);
     }
 
+    @Test 
+    void checkLoginError() {
+        Server.stopServer();
+
+        Model model = new MockModel();
+        String response = model.performLoginRequest("test_user", "password");
+        String error = "Error: Server down";
+        assertEquals(error, response);
+    }
+
+    // BDD TEST
+    @Test 
+    void completeServerErrorTest() {
+        // login with test user
+        Model model = new MockModel();
+        String retrievedUserId = model.performLoginRequest("test_user", "password");
+        assertEquals(MockModel.mockUserId, retrievedUserId);
+
+        // cut connection and ask for recipe
+        Server.stopServer();
+        Recipe originalRecipe = new Recipe("potatoes", "boil the potatoes", "brunch", "boiled potatoes");
+        String response = model.postRecipe(originalRecipe);
+        String error = "Error: Server down";
+        assertEquals(error, response);
+    }
+
 }