Fix antipatterns in tests

Author: zahar.kalosha

src/test/java/com/example/postgresdemo/controller/QuestionControllerTest.java

@@ -4,6 +4,8 @@
 import com.example.postgresdemo.repository.QuestionRepository;
 
 import org.hamcrest.Matchers;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -38,61 +40,52 @@ public class QuestionControllerTest {
     @Autowired
     private QuestionController questionController;
 
-    @Test
-    public void testCreateMockMvc() {
-        assertNotNull(mockMvc);
-    }
-
-    private boolean fillQuestions(Integer number) {
-        try {
-            for (int i = 0; i < number; i++) {
-                Question question = new Question();
-                question.setTitle("Question " + i);
-                question.setDescription("Description " + i);
-                questionRepository.save(question);
-            }
-            return true;
-        } catch (Exception e) {
-            return false;
+    private void fillQuestions(Integer number) {
+        for (int i = 0; i < number; i++) {
+            Question question = new Question();
+            question.setTitle("Question " + i);
+            question.setDescription("Description " + i);
+            questionRepository.save(question);
         }
     }
 
-    private boolean deleteQuestions() {
-        try {
-            questionRepository.deleteAll();
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    private void deleteQuestionsWithExceptionOnFail() throws Exception {
-        if (!deleteQuestions()) {
-            throw new Exception("Failed to delete questions");
-        }
+    @BeforeEach
+    @AfterEach
+    public void deleteQuestions() {
+        questionRepository.deleteAll();
     }
 
     @Test
-    public void testGetQuestions() throws Exception {
-        deleteQuestionsWithExceptionOnFail();
+    public void testGetQuestionsWithAmountLessThanPageSize() throws Exception {
+        int assertionNumber = 10;
+        int pageSize = 20;
 
-        for (int assertionNumber = 0; assertionNumber < 100; assertionNumber++) {
-            int pageSize = 20;
+        fillQuestions(assertionNumber);
 
-            if (!fillQuestions(assertionNumber)) {
-                throw new Exception("Failed to fill questions");
-            }
+        mockMvc.perform(get("/questions")
+                        .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.content.length()", Matchers.equalTo(assertionNumber)))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.totalElements", Matchers.equalTo(assertionNumber)))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.totalPages", Matchers.equalTo(1)));
+    }
 
-            mockMvc.perform(get("/questions")
-                            .contentType(MediaType.APPLICATION_JSON))
-                    .andExpect(status().isOk())
-                    .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-                    .andExpect(MockMvcResultMatchers.jsonPath("$.content.length()", Matchers.equalTo(Math.min(assertionNumber, pageSize))))
-                    .andExpect(MockMvcResultMatchers.jsonPath("$.totalElements", Matchers.equalTo(assertionNumber))) // Assert total elements
-                    .andExpect(MockMvcResultMatchers.jsonPath("$.totalPages", Matchers.equalTo((int) Math.ceil(assertionNumber / (double) pageSize)))); // Assert total pages for 10 items per page
+    @Test
+    public void testGetQuestionsWithAmountMoreThanPageSize() throws Exception {
+        int assertionNumber = 30;
+        int pageSize = 20;
+        int totalPages = (int) Math.ceil(assertionNumber / (double) pageSize);
 
-            deleteQuestionsWithExceptionOnFail();
-        }
+        fillQuestions(assertionNumber);
+
+        mockMvc.perform(get("/questions")
+                        .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.content.length()", Matchers.equalTo(pageSize)))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.totalElements", Matchers.equalTo(assertionNumber)))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.totalPages", Matchers.equalTo(totalPages)));
     }
 
     @Test
@@ -107,8 +100,6 @@ public void testCreateCorrectQuestion() throws Exception {
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.title", Matchers.equalTo("Question 1")))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.description", Matchers.equalTo("Description 1")));
-
-        deleteQuestionsWithExceptionOnFail();
     }
 
     @Test
@@ -119,8 +110,6 @@ public void testCreateQuestionWithoutTitle() throws Exception {
                                 "    \"description\": \"Description\"\n" +
                                 "}"))
                 .andExpect(status().is4xxClientError());
-
-        deleteQuestionsWithExceptionOnFail();
     }
 
     @Test
@@ -132,23 +121,20 @@ public void testCreateQuestionWithTitleLesThenThreeChars() throws Exception {
                                 "    \"description\": \"Description\"\n" +
                                 "}"))
                 .andExpect(status().is4xxClientError());
-
-        deleteQuestionsWithExceptionOnFail();
     }
 
     @Test
     public void testCreateQuestionWithTitleMoreThenHundredChars() throws Exception {
         int numberOfChars = 101;
         String title = CharBuffer.allocate(numberOfChars).toString().replace('\0', 'T');
+
         mockMvc.perform(MockMvcRequestBuilders.post("/questions")
                         .contentType(MediaType.APPLICATION_JSON)
                         .content("{\n" +
                                 "    \"title\": \"" + title + "\",\n" +
                                 "    \"description\": \"Description\"\n" +
                                 "}"))
                 .andExpect(status().is4xxClientError());
-
-        deleteQuestionsWithExceptionOnFail();
     }
 
     @Test
@@ -162,13 +148,10 @@ public void testCreateQuestionWithoutDescription() throws Exception {
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.title", Matchers.equalTo("Question 1")))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.description", Matchers.equalTo(null)));
-
-        deleteQuestionsWithExceptionOnFail();
     }
 
     @Test
     public void testUpdateQuestion() throws Exception {
-        deleteQuestionsWithExceptionOnFail();
         fillQuestions(1);
         long questionId = questionRepository.findAll().get(0).getId();
 
@@ -182,13 +165,14 @@ public void testUpdateQuestion() throws Exception {
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.title", Matchers.equalTo("Edited Question 1")))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.description", Matchers.equalTo("Edited Description 1")));
-
-        deleteQuestionsWithExceptionOnFail();
     }
 
     @Test
     public void testUpdateQuestionWithNonExistingId() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.put("/questions/1")
+        fillQuestions(1);
+        long questionId = questionRepository.findAll().get(0).getId();
+
+        mockMvc.perform(MockMvcRequestBuilders.put("/questions/" + (questionId + 1))
                         .contentType(MediaType.APPLICATION_JSON)
                         .content("{\n" +
                                 "    \"title\": \"Edited Question 1\",\n" +
@@ -199,14 +183,11 @@ public void testUpdateQuestionWithNonExistingId() throws Exception {
 
     @Test
     public void testDeleteQuestion() throws Exception {
-        deleteQuestionsWithExceptionOnFail();
         fillQuestions(1);
         long questionId = questionRepository.findAll().get(0).getId();
 
         mockMvc.perform(MockMvcRequestBuilders.delete("/questions/" + questionId)
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk());
-
-        deleteQuestionsWithExceptionOnFail();
     }
 }