Merge branch 'feature/getRequests' of https://github.com/UTSCCSCC01/a…

…1f22-6-c-bacon into feature/getRequests
UTSCCSCC01 · Oct 28, 2022 · c54f3b6 · c54f3b6
2 parents 6ea9169 + 754fda1
commit c54f3b6
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/test/java/ca/utoronto/utm/mcs/AppTest.java b/src/test/java/ca/utoronto/utm/mcs/AppTest.java
@@ -149,6 +149,14 @@ public void getMoviePass() throws JSONException, IOException, InterruptedExcepti
 
     @Test
     public void getMovieFail() throws JSONException, IOException, InterruptedException {
+<<<<<<< HEAD
+=======
+        JSONObject setupReq = new JSONObject()
+                     .put("name", "TestMovie")
+                     .put("movieId", "12345678901");
+        sendRequest("/api/v1/addMovie", "PUT", setupReq.toString());
+
+>>>>>>> 754fda16e642d645134f6af8558d3f96d4cfca5c
         JSONObject confirmReq = new JSONObject()
                 .put("name", "TestMovie");
         HttpResponse<String> confirmRes = sendRequest("/api/v1/getMovie", "GET", confirmReq.toString());