wyl/hertzbeat
1
0
Fork 0
mirror of https://github.com/dromara/hertzbeat.git synced 2026-09-17 09:40:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge 792c15838f into fa0a952f1e

Browse Source
This commit is contained in:
Tanay Paul
2026-09-15 15:54:01 +08:00
committed by GitHub
parent fa0a952f1e 792c15838f
commit 5d3efd7850
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class AlerterProperties {
/**
* Gotify Notify url
*/
private String gotifyWebhookUrl = "https://push.example.de/message?token=";
private String gotifyWebhookUrl = "https://push.example.de/message?token=%s";
/**
* Ntfy default server url
hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/GotifyAlertNotifyHandlerImplTest.java
+21 -4
View File
@@ -17,9 +17,11 @@
package org.apache.hertzbeat.alert.notice.impl;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.apache.hertzbeat.alert.AlerterProperties;
@@ -31,6 +33,7 @@ import org.apache.hertzbeat.alert.notice.AlertNoticeException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -70,7 +73,7 @@ class GotifyAlertNotifyHandlerImplTest {
receiver = new NoticeReceiver();
receiver.setId(1L);
receiver.setName("test-receiver");
receiver.setAccessToken("test-token");
receiver.setGotifyToken("test-token");
groupAlert = new GroupAlert();
SingleAlert singleAlert = new SingleAlert();
@@ -86,13 +89,13 @@ class GotifyAlertNotifyHandlerImplTest {
template.setId(1L);
template.setName("test-template");
template.setContent("test content");
when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
when(alerterProperties.getGotifyWebhookUrl()).thenReturn("http://localhost:8080/gotify/%s");
}
@Test
public void testNotifyAlertSuccess() {
when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
when(alerterProperties.getGotifyWebhookUrl()).thenReturn("http://localhost:8080/gotify/%s");
CommonRobotNotifyResp successResp = new CommonRobotNotifyResp();
successResp.setErrCode(0);
ResponseEntity<CommonRobotNotifyResp> responseEntity =
@@ -105,10 +108,17 @@ class GotifyAlertNotifyHandlerImplTest {
)).thenReturn(responseEntity);
gotifyAlertNotifyHandler.send(receiver, template, groupAlert);
ArgumentCaptor<String> urlCaptor = ArgumentCaptor.forClass(String.class);
verify(restTemplate).postForEntity(urlCaptor.capture(), any(), eq(CommonRobotNotifyResp.class));
assertEquals("http://localhost:8080/gotify/test-token", urlCaptor.getValue());
}
@Test
public void testNotifyAlertFailure() {
when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
when(alerterProperties.getGotifyWebhookUrl()).thenReturn("http://localhost:8080/gotify/%s");
CommonRobotNotifyResp failResp = new CommonRobotNotifyResp();
failResp.setCode(1);
failResp.setErrMsg("Test Error");
@@ -124,4 +134,11 @@ class GotifyAlertNotifyHandlerImplTest {
assertThrows(AlertNoticeException.class,
() -> gotifyAlertNotifyHandler.send(receiver, template, groupAlert));
}
@Test
public void testDefaultAlerterPropertiesUrl() {
AlerterProperties properties = new AlerterProperties();
String formattedUrl = String.format(properties.getGotifyWebhookUrl(), "test-token");
assertEquals("https://push.example.de/message?token=test-token", formattedUrl);
}
}