Skip to content

Commit 536e495

Browse files
author
Javen
committed
Impove tests: prepare audience for audience tests.
Don't depend on default audience.
1 parent b23043b commit 536e495

File tree

5 files changed

+63
-22
lines changed

5 files changed

+63
-22
lines changed

‎test/cn/jpush/api/BaseTest.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ public abstract class BaseTest {
1010
public static final String ALERT = "JPush Test - alert";
1111
public static final String MSG_CONTENT = "JPush Test - msgContent";
1212

13-
public static final String TAG1 = "tag1";
14-
public static final String TAG2 = "tag2";
15-
public static final String TAG_ALL = "tag_all";
16-
public static final String TAG_NO = "tag_no";
17-
public static final String ALIAS1 = "alias1";
18-
public static final String ALIAS2 = "alias2";
19-
public static final String ALIAS_NO = "alias_no";
2013
public static final String REGISTRATION_ID1 = "0900e8d85ef";
2114
public static final String REGISTRATION_ID2 = "0a04ad7d8b4";
2215

‎test/cn/jpush/api/device/DeviceNormalRemoteTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void testUpdateDeviceTagAlias_add_remove_tags() throws APIConnectionExcep
3232
Set<String> tagsToRemove = new HashSet<String>();
3333
tagsToRemove.add("tag3");
3434
tagsToRemove.add("tag4");
35-
DefaultResult result = jpushClient.updateDeviceTagAlias(REGISTRATION_ID1, ALIAS1, tagsToAdd, tagsToRemove);
35+
DefaultResult result = jpushClient.updateDeviceTagAlias(REGISTRATION_ID1, "alias1", tagsToAdd, tagsToRemove);
3636
assertTrue(result.isResultOK());
3737
}
3838

@@ -42,7 +42,7 @@ public void testGetDeviceTagAlias_1() throws Exception {
4242
TagAliasResult result = jpushClient.getDeviceTagAlias(REGISTRATION_ID1);
4343

4444
assertTrue(result.isResultOK());
45-
assertEquals("alias not equals", ALIAS1, result.alias);
45+
assertEquals("alias not equals", "alias1", result.alias);
4646

4747
assertTrue("tag contains", result.tags.contains("tag1"));
4848
assertTrue("tag contains", result.tags.contains("tag2"));
@@ -52,7 +52,7 @@ public void testGetDeviceTagAlias_1() throws Exception {
5252
@Test
5353
@TestOrder(order = 111)
5454
public void testGetAliasDeviceList_1() throws APIConnectionException, APIRequestException {
55-
AliasDeviceListResult result = jpushClient.getAliasDeviceList(ALIAS1, null);
55+
AliasDeviceListResult result = jpushClient.getAliasDeviceList("alias1", null);
5656
assertTrue(result.registration_ids.contains(REGISTRATION_ID1));
5757
}
5858

@@ -137,36 +137,36 @@ public void testDeletetag2() throws APIConnectionException, APIRequestException
137137
@Test
138138
@TestOrder(order = 230)
139139
public void testGetAliasDevices_1() throws Exception {
140-
AliasDeviceListResult result = jpushClient.getAliasDeviceList(ALIAS1, null);
140+
AliasDeviceListResult result = jpushClient.getAliasDeviceList("alias1", null);
141141
assertTrue(result.isResultOK());
142142
}
143143

144144
@Test
145145
@TestOrder(order = 300)
146146
public void testGetAliasDeviceList() throws APIConnectionException, APIRequestException {
147-
AliasDeviceListResult result = jpushClient.getAliasDeviceList(ALIAS1, "android");
147+
AliasDeviceListResult result = jpushClient.getAliasDeviceList("alias1", "android");
148148
assertTrue(result.isResultOK());
149149
}
150150

151151
@Test
152152
@TestOrder(order = 310)
153153
public void testGetAliasDeviceList_2() throws APIConnectionException, APIRequestException {
154-
AliasDeviceListResult result = jpushClient.getAliasDeviceList(ALIAS1, null);
154+
AliasDeviceListResult result = jpushClient.getAliasDeviceList("alias1", null);
155155
assertTrue(result.registration_ids.size() == 0);
156156
}
157157

158158
@Test
159159
@TestOrder(order = 320)
160160
public void testDeleteAlias() throws APIConnectionException, APIRequestException {
161-
DefaultResult result = jpushClient.deleteAlias(ALIAS2, "android");
161+
DefaultResult result = jpushClient.deleteAlias("alias2", "android");
162162
assertTrue(result.isResultOK());
163163
}
164164

165165

166166
@Test
167167
@TestOrder(order = 330)
168168
public void testDeleteAlias_2() throws APIConnectionException, APIRequestException {
169-
DefaultResult result = jpushClient.deleteAlias(ALIAS2, null);
169+
DefaultResult result = jpushClient.deleteAlias("alias2", null);
170170
assertTrue(result.isResultOK());
171171
}
172172
}

‎test/cn/jpush/api/push/remote/AudienceTest.java‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
package cn.jpush.api.push.remote;
22

3-
import static org.junit.Assert.*;
3+
import static org.hamcrest.CoreMatchers.is;
4+
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertThat;
6+
import static org.junit.Assert.assertTrue;
47

8+
import java.util.Set;
9+
10+
import org.junit.BeforeClass;
511
import org.junit.Test;
612

13+
import cn.jpush.api.JPushClient;
714
import cn.jpush.api.common.resp.APIConnectionException;
815
import cn.jpush.api.common.resp.APIRequestException;
16+
import cn.jpush.api.common.resp.DefaultResult;
917
import cn.jpush.api.push.PushResult;
1018
import cn.jpush.api.push.model.Platform;
1119
import cn.jpush.api.push.model.PushPayload;
@@ -14,6 +22,8 @@
1422
import cn.jpush.api.push.model.audience.AudienceType;
1523
import cn.jpush.api.push.model.notification.Notification;
1624

25+
import com.google.common.collect.Sets;
26+
1727
/**
1828
* Device1: 0900e8d85ef
1929
* Device2:
@@ -29,6 +39,31 @@
2939
*
3040
*/
3141
public class AudienceTest extends BaseRemotePushTest {
42+
public static final String TAG1 = "audience_tag1";
43+
public static final String TAG2 = "audience_tag2";
44+
public static final String TAG_ALL = "audience_tag_all";
45+
public static final String TAG_NO = "audience_tag_no";
46+
public static final String ALIAS1 = "audience_alias1";
47+
public static final String ALIAS2 = "audience_alias2";
48+
public static final String ALIAS_NO = "audience_alias_no";
49+
50+
@BeforeClass
51+
public static void setAudiences() throws Exception {
52+
Set<String> tags1 = Sets.newHashSet();
53+
tags1.add(TAG1);
54+
tags1.add(TAG_ALL);
55+
56+
Set<String> tags2 = Sets.newHashSet();
57+
tags1.add(TAG2);
58+
tags1.add(TAG_ALL);
59+
60+
JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
61+
DefaultResult result = jpushClient.updateDeviceTagAlias(REGISTRATION_ID1, ALIAS1, tags1, null);
62+
assertThat(result.isResultOK(), is(true));
63+
64+
result = jpushClient.updateDeviceTagAlias(REGISTRATION_ID2, ALIAS2, tags2, null);
65+
assertThat(result.isResultOK(), is(true));
66+
}
3267

3368
// one --------
3469

@@ -125,7 +160,7 @@ public void sendByAliasMore() throws Exception {
125160
.setNotification(Notification.alert(ALERT))
126161
.build();
127162
PushResult result = _client.sendPush(payload);
128-
assertTrue(result.isResultOK());
163+
assertTrue("Should be OK", result.isResultOK());
129164
}
130165

131166

‎test/cn/jpush/api/push/remote/BaseRemotePushTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.google.gson.JsonObject;
1313
import com.google.gson.JsonPrimitive;
1414

15-
public class BaseRemotePushTest extends BaseTest {
15+
public abstract class BaseRemotePushTest extends BaseTest {
1616

1717
public static final String CONTENT_TYPE_JSON = "application/json";
1818

@@ -23,7 +23,7 @@ public class BaseRemotePushTest extends BaseTest {
2323
public static final int TOO_BIG = 1005;
2424
public static final int APPKEY_NOT_EXIST = 1008;
2525
public static final int NO_TARGET = 1011;
26-
26+
2727
protected static PushClient _client = null;
2828

2929
@After

‎test/cn/jpush/api/push/remote/SpecialCharacterTest.java‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
package cn.jpush.api.push.remote;
22

3-
import static org.junit.Assert.*;
3+
import static org.hamcrest.CoreMatchers.is;
4+
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertThat;
46

7+
import org.junit.BeforeClass;
58
import org.junit.Test;
69

10+
import cn.jpush.api.JPushClient;
711
import cn.jpush.api.common.resp.APIConnectionException;
812
import cn.jpush.api.common.resp.APIRequestException;
13+
import cn.jpush.api.common.resp.DefaultResult;
914
import cn.jpush.api.push.model.Message;
1015
import cn.jpush.api.push.model.Platform;
1116
import cn.jpush.api.push.model.PushPayload;
@@ -25,7 +30,7 @@ public int sendMessage(String content) {
2530

2631
PushPayload payload = PushPayload.newBuilder()
2732
.setPlatform(Platform.all())
28-
.setAudience(Audience.tag(TAG1))
33+
.setAudience(Audience.alias("special_c"))
2934
.setMessage(message)
3035
.build();
3136
try {
@@ -41,7 +46,7 @@ public int sendMessage(String content) {
4146
public int sendNotification(String alert) {
4247
PushPayload payload = PushPayload.newBuilder()
4348
.setPlatform(Platform.all())
44-
.setAudience(Audience.tag(TAG1))
49+
.setAudience(Audience.alias("special_c"))
4550
.setNotification(Notification.alert(alert))
4651
.build();
4752
try {
@@ -54,6 +59,14 @@ public int sendNotification(String alert) {
5459
return 0;
5560
}
5661

62+
63+
@BeforeClass
64+
public static void prepareAudience() throws Exception {
65+
JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
66+
DefaultResult result = jpushClient.updateDeviceTagAlias(REGISTRATION_ID1, "special_c", null, null);
67+
assertThat(result.isResultOK(), is(true));
68+
}
69+
5770
@Test
5871
public void testCharacters() {
5972
String prefix = "JPush Special Character tests - ";

0 commit comments

Comments
 (0)