adds assertions

rajadilipkolli · Dec 22, 2024 · 4ba0017 · 4ba0017
1 parent 101a7c0
commit 4ba0017
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 14 deletions.
diff --git a/scheduler/boot-scheduler-quartz/src/main/java/com/scheduler/quartz/model/common/Message.java b/scheduler/boot-scheduler-quartz/src/main/java/com/scheduler/quartz/model/common/Message.java
@@ -31,6 +31,10 @@ public static Message success(String msg) {
         return new Message(true, msg);
     }
 
+    public Message() {
+        super();
+    }
+
     public Message(boolean valid, String msg) {
         super();
         this.valid = valid;

diff --git a/...duler-quartz/src/test/java/com/scheduler/quartz/web/controller/JobsControllerIntTest.java b/...duler-quartz/src/test/java/com/scheduler/quartz/web/controller/JobsControllerIntTest.java
@@ -1,32 +1,50 @@
 package com.scheduler.quartz.web.controller;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.scheduler.quartz.common.AbstractIntegrationTest;
+import com.scheduler.quartz.model.common.Message;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 
 class JobsControllerIntTest extends AbstractIntegrationTest {
 
     @Test
     void testGetJobs() {
-        mockMvcTester.get().uri("/api").assertThat().hasStatusOk().hasContentType(MediaType.APPLICATION_JSON);
+        mockMvcTester
+                .get()
+                .uri("/api")
+                .assertThat()
+                .hasStatusOk()
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(List.class);
     }
 
     @Test
     void testGetJobsStatuses() {
-        mockMvcTester.get().uri("/api/statuses").assertThat().hasStatusOk().hasContentType(MediaType.APPLICATION_JSON);
+        mockMvcTester
+                .get()
+                .uri("/api/statuses")
+                .assertThat()
+                .hasStatusOk()
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(List.class);
     }
 
     @Test
     void testSaveOrUpdate() {
         String requestBody =
                 """
-                    {
-                        "jobName": "SampleJob",
-                        "cronExpression": "0/5 * * * * ?",
-                        "jobId": "12345",
-                        "description": "Test job description"
-                    }
-                """;
+                        {
+                            "jobName": "SampleJob",
+                            "cronExpression": "0/5 * * * * ?",
+                            "jobId": "12345",
+                            "description": "Test job description"
+                        }
+                    """;
 
         mockMvcTester
                 .post()
@@ -36,7 +54,14 @@ void testSaveOrUpdate() {
                 .accept(MediaType.APPLICATION_JSON)
                 .assertThat()
                 .hasStatusOk()
-                .hasContentType(MediaType.APPLICATION_JSON);
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(Message.class)
+                .satisfies(message -> {
+                    assertThat(message.getMsg()).isNull();
+                    assertThat(message.isValid()).isEqualTo(true);
+                    assertThat(message.getData()).isNull();
+                });
     }
 
     @Test
@@ -59,7 +84,12 @@ void testSaveOrUpdateWithInvalidCronExpression() {
                 .accept(MediaType.APPLICATION_JSON)
                 .assertThat()
                 .hasStatusOk()
-                .hasContentType(MediaType.APPLICATION_JSON);
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(Message.class)
+                .satisfies(message -> {
+                    assertThat(message.getMsg()).isEqualTo("CronExpression '0/5 * * * *' is invalid.");
+                });
     }
 
     @Test
@@ -101,7 +131,12 @@ void testPauseJobWithInvalidJobName() {
                 .accept(MediaType.APPLICATION_JSON)
                 .assertThat()
                 .hasStatusOk()
-                .hasContentType(MediaType.APPLICATION_JSON);
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(Message.class)
+                .satisfies(message -> {
+                    assertThat(message.getMsg()).isEqualTo("Job does not exist with key: DEFAULT.InvalidJob");
+                });
     }
 
     @Test
@@ -141,7 +176,12 @@ void testResumeJobWithInvalidJobName() {
                 .accept(MediaType.APPLICATION_JSON)
                 .assertThat()
                 .hasStatusOk()
-                .hasContentType(MediaType.APPLICATION_JSON);
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(Message.class)
+                .satisfies(message -> {
+                    assertThat(message.getMsg()).isEqualTo("Job does not exist with key: DEFAULT.InvalidJob");
+                });
     }
 
     @Test
@@ -183,7 +223,12 @@ void testRunJobWithInvalidJobName() {
                 .accept(MediaType.APPLICATION_JSON)
                 .assertThat()
                 .hasStatusOk()
-                .hasContentType(MediaType.APPLICATION_JSON);
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(Message.class)
+                .satisfies(message -> {
+                    assertThat(message.getMsg()).isEqualTo("Job does not exist with key: DEFAULT.InvalidJob");
+                });
     }
 
     @Test
@@ -206,4 +251,30 @@ void testDeleteJob() {
                 .hasStatusOk()
                 .hasContentType(MediaType.APPLICATION_JSON);
     }
+
+    @Test
+    void testDeleteJobWithInvalidJobName() {
+        String requestBody =
+                """
+                    {
+                        "jobName": "InvalidJob",
+                        "jobId": "12345"
+                    }
+                """;
+
+        mockMvcTester
+                .delete()
+                .uri("/api/deleteJob")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(requestBody)
+                .accept(MediaType.APPLICATION_JSON)
+                .assertThat()
+                .hasStatusOk()
+                .hasContentType(MediaType.APPLICATION_JSON)
+                .bodyJson()
+                .convertTo(Message.class)
+                .satisfies(message -> {
+                    assertThat(message.getMsg()).isEqualTo("Job does not exist with key: DEFAULT.InvalidJob");
+                });
+    }
 }