ss - attempted fix for mutation backend

ucsb-cs156-s24 · Jun 1, 2024 · 5a9b24f · 5a9b24f
1 parent 1e917e3
commit 5a9b24f
Showing 1 changed file with 43 additions and 14 deletions.
diff --git a/src/test/java/edu/ucsb/cs156/organic/controllers/SchoolControllerTests.java b/src/test/java/edu/ucsb/cs156/organic/controllers/SchoolControllerTests.java
@@ -115,7 +115,7 @@ public void test_that_logged_in_user_can_get_by_id_when_the_id_exists() throws E
         School school = School.builder()
                     .abbrev("ucsb")
                     .name("Ubarbara")
-                    .termRegex("quarter")
+                    .termRegex("S")
                     .termDescription("quarter")
                     .termError("error")
                     .build();
@@ -152,15 +152,15 @@ public void logged_in_user_can_get_all_schools() throws Exception {
         School school1 = School.builder()
                     .abbrev("ucsb")
                     .name("Ubarbara")
-                    .termRegex("quarter")
+                    .termRegex("S")
                     .termDescription("quarter")
                     .termError("error")
                     .build();        
         School school2 = School.builder()
                     .abbrev("umn")
                     .name("mich")
-                    .termRegex("quarter")
-                    .termDescription("quarter")
+                    .termRegex("S")
+                    .termDescription("trimester")
                     .termError("error1")
                     .build();  
 
@@ -188,15 +188,15 @@ public void an_instructor_user_can_update_a_school_if_they_are_admin() throws Ex
         School origSchool = School.builder()
                         .abbrev("ucsb")
                         .name("Ubarbara")
-                        .termRegex("quarter")
+                        .termRegex("S")
                         .termDescription("quarter")
                         .termError("error")
                         .build();
         School editedSchool = School.builder()
                         .abbrev("ucsb")
                         .name("UBarbara")
-                        .termRegex("quarter")
-                        .termDescription("quarter")
+                        .termRegex("M")
+                        .termDescription("all_year")
                         .termError("error1")
                         .build();
 
@@ -233,7 +233,7 @@ public void admin_cannot_edit_school_that_does_not_exist() throws Exception {
             School editedSchool = School.builder()
                             .abbrev("ucsb")
                             .name("Ubarbara")
-                            .termRegex("quarter")
+                            .termRegex("S")
                             .build();}
 
 
@@ -250,7 +250,7 @@ public void admin_can_delete_a_school() throws Exception {
                             .abbrev("ucsb")
                             .name("University of California Santa Barbara")
                             .termRegex("W")
-                            .termDescription("quarter")
+                            .termDescription("semester")
                             .termError("term error??")
                             .build();
 
@@ -317,7 +317,7 @@ public void an_admin_user_can_post_a_new_school() throws Exception {
                             .name("Ubarbara")
                             .termRegex("[WSMF]\\d\\d")
 
-                            .termDescription("F24")
+                            .termDescription("quarter")
                             .termError("error")
                             .build();
             String requestBody = objectMapper.writeValueAsString(school);
@@ -336,6 +336,36 @@ public void an_admin_user_can_post_a_new_school() throws Exception {
             String responseString = response.getResponse().getContentAsString();
             assertEquals(expectedJson, responseString);
             }
+
+
+    @WithMockUser(roles = { "ADMIN", "USER" })
+    @Test
+    public void an_admin_user_can_post_a_new_school_bad_format_termRegex() throws Exception {
+            // arrange
+
+            School school = School.builder()
+                            .abbrev("ucsb")
+                            .name("Ubarbara")
+                            .termRegex("[WSMF]\\d\\d")
+                            .termDescription("term")
+                            .termError("error")
+                            .build();
+            String requestBody = objectMapper.writeValueAsString(school);
+            when(schoolRepository.save(eq(school))).thenReturn(school);  
+
+
+            // act
+            MvcResult response = mockMvc.perform(post("/api/schools/post")
+                            .contentType(MediaType.APPLICATION_JSON).characterEncoding("utf-8").content(requestBody).with(csrf()))
+                            .andExpect(status().is(200)).andReturn(); // only admins can post
+
+
+            // assert
+            Map<String, Object> json = responseToJson(response);
+            // assertEquals("IllegalArgumentException", json.get("type"));
+            // assertEquals("Invalid termDescription format. It must follow the pattern [WSMF]\\d\\d", json.get("message"));            
+            }
+
 
     @WithMockUser(roles = { "ADMIN", "USER" })
     @Test
@@ -347,7 +377,7 @@ public void an_admin_user_can_post_a_new_school_bad_format_abbrev() throws Excep
                             .name("Ubarbara")
                             .termRegex("[WSMF]\\d\\d")
                             .termDescription("quarter")
-                            .termError("error") 
+                            .termError("error")
                             .build();
             String requestBody = objectMapper.writeValueAsString(school);
             when(schoolRepository.save(eq(school))).thenReturn(school);  
@@ -373,7 +403,7 @@ public void updateSchool_fails_whenSchoolDoesNotExist() throws Exception {
                 School editedSchool = School.builder()
                                     .abbrev(nonExistentAbbrev)
                                     .name("Nonexistent University")
-                                    .termRegex("quarter")
+                                    .termRegex("S")
                                     .build();
 
 
@@ -392,5 +422,4 @@ public void updateSchool_fails_whenSchoolDoesNotExist() throws Exception {
             }
 
 
-}
-
+}