[Improve] add alarm define slience unit test

alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java

@@ -27,8 +27,13 @@
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.dto.Message;
+
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -61,7 +66,13 @@ public ResponseEntity<Message<Page<AlertDefine>>> getAlertDefines(
             @Parameter(description = "List current page", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
             @Parameter(description = "Number of list pages", example = "8") @RequestParam(defaultValue = "8") int pageSize) {
         Page<AlertDefine> alertDefinePage = alertDefineService.getAlertDefines(ids, search, priority, sort, order, pageIndex, pageSize);
-        return ResponseEntity.ok(Message.success(alertDefinePage));
+
+        return  ResponseEntity.ok(Message.success(
+                new PageImpl<>(
+                        alertDefinePage.getContent(),
+                        PageRequest.of(pageIndex, pageSize, Sort.by(new Sort.Order(Sort.Direction.fromString(order), sort))),
+                        alertDefinePage.getTotalElements()))
+        );
     }
 
     @DeleteMapping
@@ -79,9 +90,9 @@ public ResponseEntity<Message<Void>> deleteAlertDefines(
     @GetMapping("/export")
     @Operation(summary = "export alertDefine config", description = "export alarm definition configuration")
     public void export(
-        @Parameter(description = "AlertDefine ID List", example = "656937901") @RequestParam List<Long> ids,
-        @Parameter(description = "Export Type:JSON,EXCEL,YAML") @RequestParam(defaultValue = "JSON") String type,
-        HttpServletResponse res) throws Exception {
+            @Parameter(description = "AlertDefine ID List", example = "656937901") @RequestParam List<Long> ids,
+            @Parameter(description = "Export Type:JSON,EXCEL,YAML") @RequestParam(defaultValue = "JSON") String type,
+            HttpServletResponse res) throws Exception {
         alertDefineService.export(ids, type, res);
     }
 

alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java

@@ -31,6 +31,7 @@
 import org.apache.hertzbeat.common.entity.dto.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
@@ -87,9 +88,14 @@ public ResponseEntity<Message<Page<AlertSilence>>> getAlertSilences(
         };
         Sort sortExp = Sort.by(new Sort.Order(Sort.Direction.fromString(order), sort));
         PageRequest pageRequest = PageRequest.of(pageIndex, pageSize, sortExp);
+
+        // Impl obj copy to solved Could not write JSON: (was java.lang.UnsupportedOperationException)]
         Page<AlertSilence> alertSilencePage = alertSilenceService.getAlertSilences(specification, pageRequest);
-        Message<Page<AlertSilence>> message = Message.success(alertSilencePage);
-        return ResponseEntity.ok(message);
+        Page<AlertSilence> alertSilencePages = new PageImpl<>(
+                alertSilencePage.getContent(),
+                pageRequest, alertSilencePage.getTotalElements());
+
+        return ResponseEntity.ok(Message.success(alertSilencePages));
     }
 
     @DeleteMapping

alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java

@@ -17,16 +17,17 @@
 
 package org.apache.hertzbeat.alert.controller;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import java.util.ArrayList;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
+
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
@@ -38,9 +39,10 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -53,99 +55,64 @@
 @ExtendWith(MockitoExtension.class)
 class AlertDefinesControllerTest {
 
-    private MockMvc mockMvc;
-
-    @InjectMocks
-    private AlertDefinesController alertDefinesController;
-
-    @Mock
-    AlertDefineService alertDefineService;
-
-    // Parameters to avoid default values interference, default values have been replaced
-    List<Long> ids = Stream.of(6565463543L, 6565463544L).collect(Collectors.toList());
-    Byte priority = Byte.parseByte("1");
-    String sort = "gmtCreate";
-    String order = "asc";
-    Integer pageIndex = 1;
-    Integer pageSize = 7;
-
-    // Parameter collection
-    Map<String, Object> content = new HashMap<>();
-
-    // Object for mock
-    PageRequest pageRequest;
-
-    // Since the specification is used in dynamic proxy, it cannot be mocked
-    // Missing debugging parameters are ids, priority
-    // The missing part has been manually output for testing
-
-    @BeforeEach
-    void setUp() {
-        this.mockMvc = MockMvcBuilders.standaloneSetup(alertDefinesController).build();
-        content.put("ids", ids);
-        content.put("priority", priority);
-        content.put("sort", sort);
-        content.put("order", order);
-        content.put("pageIndex", pageIndex);
-        content.put("pageSize", pageSize);
-        Sort sortExp = Sort.by(new Sort.Order(Sort.Direction.fromString(content.get("order").toString()), content.get("sort").toString()));
-        pageRequest = PageRequest.of((Integer) content.get("pageIndex"), (Integer) content.get("pageSize"), sortExp);
-    }
-
-    //    @Test
-    // todo: fix this test
-    void getAlertDefines() throws Exception {
-
-        // Test the correctness of the mock
-        // Although objects cannot be mocked, stubs can be stored using class files
-        //        Mockito.when(alertDefineService.getAlertDefines(Mockito.any(Specification.class), Mockito.argThat(new ArgumentMatcher<PageRequest>() {
-        //            @Override
-        //            public boolean matches(PageRequest pageRequestMidden) {
-        //                // There are three methods in the source code that need to be compared, namely getPageNumber(), getPageSize(), getSort()
-        //                if(pageRequestMidden.getPageSize() == pageRequest.getPageSize() &&
-        //                        pageRequestMidden.getPageNumber() == pageRequest.getPageNumber() &&
-        //                        pageRequestMidden.getSort().equals(pageRequest.getSort())) {
-        //                    return true;
-        //                }
-        //                return false;
-        //            }
-        //        }))).thenReturn(new PageImpl<AlertDefine>(new ArrayList<AlertDefine>()));
-        AlertDefine define = AlertDefine.builder().id(9L).app("linux").metric("disk").field("usage").expr("x").times(1).tags(new LinkedList<>()).build();
-        Mockito.when(alertDefineService.getAlertDefines(null, null, null, "id", "desc", 1, 10)).thenReturn(new PageImpl<>(Collections.singletonList(define)));
-
-        mockMvc.perform(MockMvcRequestBuilders.get(
-                "/api/alert/defines")
-                .param("ids", ids.toString().substring(1, ids.toString().length() - 1))
-                .param("priority", priority.toString())
-                .param("sort", sort)
-                .param("order", order)
-                .param("pageIndex", pageIndex.toString())
-                .param("pageSize", pageSize.toString()))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
-                .andExpect(jsonPath("$.data.content").value(new ArrayList<>()))
-                .andExpect(jsonPath("$.data.pageable").value("INSTANCE"))
-                .andExpect(jsonPath("$.data.totalPages").value(1))
-                .andExpect(jsonPath("$.data.totalElements").value(0))
-                .andExpect(jsonPath("$.data.last").value(true))
-                .andExpect(jsonPath("$.data.number").value(0))
-                .andExpect(jsonPath("$.data.size").value(0))
-                .andExpect(jsonPath("$.data.first").value(true))
-                .andExpect(jsonPath("$.data.numberOfElements").value(0))
-                .andExpect(jsonPath("$.data.empty").value(true))
-                .andExpect(jsonPath("$.data.sort.empty").value(true))
-                .andExpect(jsonPath("$.data.sort.sorted").value(false))
-                .andExpect(jsonPath("$.data.sort.unsorted").value(true))
-                .andReturn();
-    }
-
-    @Test
-    void deleteAlertDefines() throws Exception {
-        this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/alert/defines")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(JsonUtil.toJson(ids)))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
-                .andReturn();
-    }
+	private MockMvc mockMvc;
+
+	@InjectMocks
+	private AlertDefinesController alertDefinesController;
+
+	@Mock
+	private AlertDefineService alertDefineService;
+
+	private AlertDefine alertDefine;
+
+	@BeforeEach
+	void setUp() {
+
+		this.mockMvc = standaloneSetup(alertDefinesController).build();
+
+		alertDefine = AlertDefine.builder()
+				.id(9L)
+				.app("linux")
+				.metric("disk")
+				.field("usage")
+				.expr("x")
+				.times(1)
+				.tags(new LinkedList<>())
+				.build();
+	}
+
+	@Test
+	void getAlertDefines() throws Exception {
+
+        when(alertDefineService.getAlertDefines(List.of(1L), "Test", (byte) 1, "id", "desc", 1, 10))
+                .thenReturn(new PageImpl<>(Collections.singletonList(alertDefine)));
+
+		mockMvc.perform(MockMvcRequestBuilders.get(
+								"/api/alert/defines")
+						.param("ids", "1")
+						.param("search", "Test")
+                        .param("priority", "1")
+						.param("sort", "id")
+						.param("order", "desc")
+						.param("pageIndex", "1")
+						.param("pageSize", "10"))
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+				.andExpect(jsonPath("$.data.content[0].app").value("linux"))
+				.andExpect(jsonPath("$.data.content[0].id").value("9"))
+				.andExpect(jsonPath("$.data.content[0].metric").value("disk"))
+				.andReturn();
+	}
+
+	@Test
+	void deleteAlertDefines() throws Exception {
+
+		this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/alert/defines")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(JsonUtil.toJson(Collections.singletonList(1))))
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+				.andReturn();
+	}
+
 }

alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertSilencesControllerTest.java

@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.controller;
+
+import java.util.Collections;
+
+import org.apache.hertzbeat.alert.service.AlertSilenceService;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.AlertSilence;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+/**
+ * test case for {@link AlertSilencesController}
+ */
+
+@ExtendWith(MockitoExtension.class)
+class AlertSilencesControllerTest {
+
+	private MockMvc mockMvc;
+
+	@Mock
+	private AlertSilenceService alertSilenceService;
+
+	private AlertSilence alertSilence;
+
+	@InjectMocks
+	private AlertSilencesController alertSilencesController;
+
+	@BeforeEach
+	void setUp() {
+
+		this.mockMvc = standaloneSetup(alertSilencesController).build();
+
+		alertSilence = AlertSilence
+				.builder()
+				.id(1L)
+				.type((byte) 1)
+				.name("Test Silence")
+				.build();
+	}
+
+	@Test
+	void testGetAlertSilences() throws Exception {
+
+		Page<AlertSilence> alertSilencePage = new PageImpl<>(Collections.singletonList(alertSilence));
+		when(alertSilenceService.getAlertSilences(
+				any(Specification.class),
+				any(PageRequest.class))
+		).thenReturn(alertSilencePage);
+
+		mockMvc.perform(get("/api/alert/silences")
+						.param("ids", "1")
+						.param("search", "Test")
+						.param("sort", "id")
+						.param("order", "desc")
+						.param("pageIndex", "0")
+						.param("pageSize", "8")
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+				.andExpect(jsonPath("$.data.content[0].id").value(1))
+				.andExpect(jsonPath("$.data.content[0].name").value("Test Silence"));
+	}
+
+	@Test
+	void testDeleteAlertDefines() throws Exception {
+
+		doNothing().when(alertSilenceService).deleteAlertSilences(any());
+
+		mockMvc.perform(delete("/api/alert/silences")
+						.param("ids", "1,2,3")
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE));
+	}
+
+}