You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/11/06 01:21:41 UTC
[incubator-skywalking] branch master updated: Fix the test case.
(#1879)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 7537af0 Fix the test case. (#1879)
7537af0 is described below
commit 7537af05981958686a99d1ec2e1b9a9eeb0d1d4f
Author: Jared.Tan <ji...@daocloud.io>
AuthorDate: Tue Nov 6 09:21:35 2018 +0800
Fix the test case. (#1879)
---
.../oap/server/core/alarm/provider/WebhookCallbackTest.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
index 961acf7..e3ef8b5 100644
--- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
+++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
@@ -34,6 +34,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.skywalking.oap.server.core.alarm.AlarmMessage;
+import org.apache.skywalking.oap.server.core.source.Scope;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -72,8 +73,14 @@ public class WebhookCallbackTest implements Servlet {
remoteEndpoints.add("http://127.0.0.1:8778/webhook/receiveAlarm");
WebhookCallback webhookCallback = new WebhookCallback(remoteEndpoints);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
- alarmMessages.add(new AlarmMessage());
- alarmMessages.add(new AlarmMessage());
+ AlarmMessage alarmMessage = new AlarmMessage();
+ alarmMessage.setScope(Scope.All);
+ alarmMessage.setAlarmMessage("alarmMessage with [Scope.All]");
+ alarmMessages.add(alarmMessage);
+ AlarmMessage anotherAlarmMessage = new AlarmMessage();
+ anotherAlarmMessage.setScope(Scope.Endpoint);
+ anotherAlarmMessage.setAlarmMessage("anotherAlarmMessage with [Scope.Endpoint]");
+ alarmMessages.add(anotherAlarmMessage);
webhookCallback.doAlarm(alarmMessages);
Assert.assertTrue(isSuccess);