Skip to content

Commit 28a21e4

Browse files
author
Javen
committed
Refine alert/msg content for debugging.
1 parent 3e58608 commit 28a21e4

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

test/cn/jpush/api/push/remote/BasicFunctionsTests.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class BasicFunctionsTests extends BaseRemoteTests {
1919

2020
@Test
2121
public void sendSimpleNotification_Pall_Ndefault() {
22-
PushPayload payload = PushPayload.alertAll(ALERT);
22+
PushPayload payload = PushPayload.alertAll("Pall Nall default alert");
2323
PushResult result = _client.sendPush(payload);
2424
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
2525
}
@@ -30,7 +30,7 @@ public void sendSimpleNotification_Pandroid_Nandroid() {
3030
.setPlatform(Platform.android())
3131
.setAudience(Audience.all())
3232
.setNotification(Notification.newBuilder()
33-
.addPlatformNotification(AndroidNotification.alert("alert"))
33+
.addPlatformNotification(AndroidNotification.alert("Pandroid Nandroid alert"))
3434
.build())
3535
.build();
3636
PushResult result = _client.sendPush(payload);
@@ -43,7 +43,7 @@ public void sendSimpleNotification_Pall_Nandroid() {
4343
.setPlatform(Platform.all())
4444
.setAudience(Audience.all())
4545
.setNotification(Notification.newBuilder()
46-
.addPlatformNotification(AndroidNotification.alert("alert"))
46+
.addPlatformNotification(AndroidNotification.alert("Pall Nandroid alert"))
4747
.build())
4848
.build();
4949
PushResult result = _client.sendPush(payload);
@@ -56,7 +56,7 @@ public void sendSimpleNotification_Pios_Nios() {
5656
.setPlatform(Platform.ios())
5757
.setAudience(Audience.all())
5858
.setNotification(Notification.newBuilder()
59-
.addPlatformNotification(IosNotification.alert("alert"))
59+
.addPlatformNotification(IosNotification.alert("Pios Nios alert"))
6060
.build())
6161
.build();
6262
PushResult result = _client.sendPush(payload);
@@ -69,7 +69,7 @@ public void sendSimpleNotification_Pall_Nios() {
6969
.setPlatform(Platform.all())
7070
.setAudience(Audience.all())
7171
.setNotification(Notification.newBuilder()
72-
.addPlatformNotification(IosNotification.alert("alert"))
72+
.addPlatformNotification(IosNotification.alert("Pall Nios alert"))
7373
.build())
7474
.build();
7575
PushResult result = _client.sendPush(payload);
@@ -82,20 +82,20 @@ public void sendSimpleNotification_Pwp_Nwp() {
8282
.setPlatform(Platform.winphone())
8383
.setAudience(Audience.all())
8484
.setNotification(Notification.newBuilder()
85-
.addPlatformNotification(WinphoneNotification.alert("alert"))
85+
.addPlatformNotification(WinphoneNotification.alert("Pwp Nwp alert"))
8686
.build())
8787
.build();
8888
PushResult result = _client.sendPush(payload);
8989
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
9090
}
9191

9292
@Test
93-
public void sendSimpleNotification_wp() {
93+
public void sendSimpleNotification_Pall_Nwp() {
9494
PushPayload payload = PushPayload.newBuilder()
9595
.setPlatform(Platform.all())
9696
.setAudience(Audience.all())
9797
.setNotification(Notification.newBuilder()
98-
.addPlatformNotification(WinphoneNotification.alert("alert"))
98+
.addPlatformNotification(WinphoneNotification.alert("Pall Nwp alert"))
9999
.build())
100100
.build();
101101
PushResult result = _client.sendPush(payload);
@@ -112,9 +112,9 @@ public void sendSimpleNotification_Pall_Nall() {
112112
.addDeviceType(DeviceType.Android).build())
113113
.setAudience(Audience.all())
114114
.setNotification(Notification.newBuilder()
115-
.addPlatformNotification(WinphoneNotification.alert("alert"))
116-
.addPlatformNotification(IosNotification.alert("alert"))
117-
.addPlatformNotification(AndroidNotification.alert("alert"))
115+
.addPlatformNotification(WinphoneNotification.alert("Pall Nall wp alert"))
116+
.addPlatformNotification(IosNotification.alert("Pall Nall ios alert"))
117+
.addPlatformNotification(AndroidNotification.alert("Pall Nall android alert"))
118118
.build())
119119
.build();
120120
PushResult result = _client.sendPush(payload);
@@ -123,7 +123,7 @@ public void sendSimpleNotification_Pall_Nall() {
123123

124124
@Test
125125
public void sendSimpleMessage_default() {
126-
PushPayload payload = PushPayload.messageAll(MSG_CONTENT);
126+
PushPayload payload = PushPayload.messageAll("Pall msg");
127127
PushResult result = _client.sendPush(payload);
128128
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
129129
}
@@ -133,7 +133,7 @@ public void sendSimpleMessage_Pandroid() {
133133
PushPayload payload = PushPayload.newBuilder()
134134
.setPlatform(Platform.android())
135135
.setAudience(Audience.all())
136-
.setMessage(Message.content(MSG_CONTENT))
136+
.setMessage(Message.content("Pandroid msg"))
137137
.build();
138138
PushResult result = _client.sendPush(payload);
139139
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
@@ -144,7 +144,7 @@ public void sendSimpleMessage_Pios() {
144144
PushPayload payload = PushPayload.newBuilder()
145145
.setPlatform(Platform.ios())
146146
.setAudience(Audience.all())
147-
.setMessage(Message.content(MSG_CONTENT))
147+
.setMessage(Message.content("Pios msg"))
148148
.build();
149149
PushResult result = _client.sendPush(payload);
150150
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
@@ -155,7 +155,7 @@ public void sendSimpleMessage_Pwinphone() {
155155
PushPayload payload = PushPayload.newBuilder()
156156
.setPlatform(Platform.winphone())
157157
.setAudience(Audience.all())
158-
.setMessage(Message.content(MSG_CONTENT))
158+
.setMessage(Message.content("Pwp msg"))
159159
.build();
160160
PushResult result = _client.sendPush(payload);
161161
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
@@ -167,8 +167,8 @@ public void sendSimpleMessageAndNotification_Pall() {
167167
PushPayload payload = PushPayload.newBuilder()
168168
.setPlatform(Platform.all())
169169
.setAudience(Audience.all())
170-
.setNotification(Notification.alert(ALERT))
171-
.setMessage(Message.content(MSG_CONTENT))
170+
.setNotification(Notification.alert("Pall Nall Mall alert"))
171+
.setMessage(Message.content("Pall Nall Mall msg"))
172172
.build();
173173
PushResult result = _client.sendPush(payload);
174174
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());

test/cn/jpush/api/push/remote/SingleTest.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,30 @@
44

55
import org.junit.Test;
66

7+
import cn.jpush.api.common.DeviceType;
78
import cn.jpush.api.push.PushResult;
9+
import cn.jpush.api.push.model.Message;
810
import cn.jpush.api.push.model.Platform;
911
import cn.jpush.api.push.model.PushPayload;
1012
import cn.jpush.api.push.model.audience.Audience;
13+
import cn.jpush.api.push.model.notification.AndroidNotification;
14+
import cn.jpush.api.push.model.notification.IosNotification;
1115
import cn.jpush.api.push.model.notification.Notification;
16+
import cn.jpush.api.push.model.notification.WinphoneNotification;
1217

1318
public class SingleTest extends BaseRemoteTests {
14-
19+
1520
@Test
16-
public void sendByTagMore() {
21+
public void sendSimpleMessageAndNotification_Pall() {
1722
PushPayload payload = PushPayload.newBuilder()
1823
.setPlatform(Platform.all())
19-
.setAudience(Audience.tag(TAG1, TAG2))
20-
.setNotification(Notification.alert(ALERT))
24+
.setAudience(Audience.all())
25+
.setNotification(Notification.alert("Pall Nall Mall alert"))
26+
.setMessage(Message.content("Pall Nall Mall msg"))
2127
.build();
2228
PushResult result = _client.sendPush(payload);
2329
assertEquals(SUCCEED_RESULT_CODE, result.getErrorCode());
2430
}
25-
26-
2731

2832
}
2933

0 commit comments

Comments
 (0)