alert warnings and tests fix (#1555)

apache · Feb 20, 2024 · 85e9296 · 85e9296
1 parent 1c8ea86
commit 85e9296
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertReportController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertReportController.java
@@ -48,6 +48,7 @@ public ResponseEntity<Message<Void>> addNewAlertReportFromCloud(@PathVariable("c
  CloudAlertReportAbstract cloudAlertReport = JsonUtil
  .fromJson(alertReport, cloudService.getCloudServiceAlarmInformationEntity());
  // 模板填充
+ assert cloudAlertReport != null;
  alert = AlertReport.builder()
  .content(cloudAlertReport.getContent())
  .alertName(cloudAlertReport.getAlertName())

diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java
@@ -1,12 +1,8 @@
 package org.dromara.hertzbeat.alert.service;
 
-import com.fasterxml.jackson.databind.json.JsonMapper;
 import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao;
 import org.dromara.hertzbeat.alert.dao.AlertDefineDao;
-import org.dromara.hertzbeat.alert.service.impl.AlertDefineExcelImExportServiceImpl;
-import org.dromara.hertzbeat.alert.service.impl.AlertDefineJsonImExportServiceImpl;
 import org.dromara.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
-import org.dromara.hertzbeat.alert.service.impl.AlertDefineYamlImExportServiceImpl;
 import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
 import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
 import org.dromara.hertzbeat.common.entity.manager.Monitor;
@@ -20,7 +16,6 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
 import java.util.*;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -46,7 +41,7 @@ class AlertDefineServiceTest {
  private List<AlertDefineImExportService> alertDefineImExportServiceList;
 
  @InjectMocks
- private AlertDefineServiceImpl alertDefineService = new AlertDefineServiceImpl(Collections.emptyList());
+ private AlertDefineServiceImpl alertDefineService;
 
  @BeforeEach
  void setUp() {
@@ -88,15 +83,13 @@ void setUp() {
  void validate() {
  assertDoesNotThrow(() -> alertDefineService.validate(alertDefine, true));
  assertDoesNotThrow(() -> alertDefineService.validate(alertDefine, false));
-
  }
 
  @Test
  void addAlertDefine() {
  assertDoesNotThrow(() -> alertDefineService.addAlertDefine(alertDefine));
  when(alertDefineDao.save(alertDefine)).thenThrow(new RuntimeException());
  assertThrows(RuntimeException.class, () -> alertDefineService.addAlertDefine(alertDefine));
-
  }
 
  @Test
@@ -115,7 +108,6 @@ void deleteAlertDefine() {
  doNothing().doThrow(new RuntimeException()).when(alertDefineDao).deleteById(id);
  assertDoesNotThrow(() -> alertDefineService.deleteAlertDefine(id));
  assertThrows(RuntimeException.class, () -> alertDefineService.deleteAlertDefine(id));
-
  }
 
  @Test
@@ -137,8 +129,6 @@ void getMonitorBindAlertDefines() {
  Specification<AlertDefine> specification = mock(Specification.class);
  when(alertDefineDao.findAll(specification, PageRequest.of(1, 1))).thenReturn(Page.empty());
  assertNotNull(alertDefineService.getMonitorBindAlertDefines(specification, PageRequest.of(1, 1)));
-
-
  }
 
  @Test
@@ -156,7 +146,6 @@ void testGetMonitorBindAlertDefines() {
  when(alertDefineDao.queryAlertDefinesByMonitor(1L, "app", "test")).thenReturn(alertDefineList);
  when(alertDefineDao.queryAlertDefinesByAppAndMetricAndPresetTrueAndEnableTrue("app", "test")).thenReturn(alertDefineList);
  assertNotNull(alertDefineService.getMonitorBindAlertDefines(1L, "app", "test"));
-
  }
 
  @Test