Skip to content

Commit 7ca9b36

Browse files
author
ablecao
committed
xingePush#22 兼容JDK 1.6
1 parent 9046bc8 commit 7ca9b36

10 files changed

+61
-64
lines changed

‎src/test/java/com/tencent/xinge/push/app/PushAccountListIOSTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void testPushAccountListIOS() {
3030

3131
message.setIos(msgIOS);
3232

33-
ArrayList<String> accountList = new ArrayList<>();
33+
ArrayList<String> accountList = new ArrayList<String>();
3434
accountList.add("xg_account");
3535
accountList.add("xg_account1");
3636

‎src/test/java/com/tencent/xinge/push/app/PushAllIOSTest.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public void testPushAllIOS() {
1313
message.setContent("testPushAllIOS from Java API");
1414
message.setTitle("testtest");
1515

16-
17-
MessageIOS msgIOS = new MessageIOS();
16+
MessageIOS msgIOS = new MessageIOS();
1817
Alert alert = new Alert();
1918
alert.setTitle("alert from Java API");
2019
alert.setBody(" body alert from Java API");
@@ -26,17 +25,16 @@ public void testPushAllIOS() {
2625

2726
message.setIos(msgIOS);
2827

29-
30-
PushAppRequest pushAppRequest = new PushAppRequest();
31-
pushAppRequest.setPlatform(Platform.all);
32-
pushAppRequest.setEnvironment(Environment.dev);
33-
pushAppRequest.setMessage_type(MessageType.notify);
28+
PushAppRequest pushAppRequest = new PushAppRequest();
29+
pushAppRequest.setPlatform(Platform.all);
30+
pushAppRequest.setEnvironment(Environment.dev);
31+
pushAppRequest.setMessage_type(MessageType.notify);
3432
pushAppRequest.setMessage(message);
3533
pushAppRequest.setSend_time("1111111");
3634
pushAppRequest.setStat_tag("test");
3735

38-
System.out.println(pushAppRequest.toString());
39-
System.out.println(xingeIOS.pushApp(pushAppRequest.toString()));
36+
System.out.println(pushAppRequest.toString());
37+
System.out.println(xingeIOS.pushApp(pushAppRequest.toString()));
4038
}
4139

4240
}

‎src/test/java/com/tencent/xinge/push/app/PushSingleAccountAndroidTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testPushSingleAccountAndroid() {
4949
pushAppRequest.setStat_tag("test");
5050
pushAppRequest.setMessage(message);
5151

52-
ArrayList<String> accountList = new ArrayList<>();
52+
ArrayList<String> accountList = new ArrayList<String>();
5353
accountList.add("xg_account");
5454
pushAppRequest.setAccount_list(accountList);
5555

‎src/test/java/com/tencent/xinge/push/app/PushSingleAccountIOSTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void testPushSingleAccountIOS() {
3030

3131
message.setIos(msgIOS);
3232

33-
ArrayList<String> accountList = new ArrayList<>();
33+
ArrayList<String> accountList = new ArrayList<String>();
3434
accountList.add("xg_account");
3535

3636
PushAppRequest pushAppRequest = new PushAppRequest();

‎src/test/java/com/tencent/xinge/push/app/PushSingleTokenAndroidTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testPushSingleTokenAndroid() {
4242
pushAppRequest.setMessage(message);
4343
pushAppRequest.setPush_id("0");
4444
pushAppRequest.setSeq(123);
45-
ArrayList<String> tokenList = new ArrayList<>();
45+
ArrayList<String> tokenList = new ArrayList<String>();
4646
tokenList.add("ece9c2a0fccc41554fcdad95b8a16fe4366d0404");
4747
pushAppRequest.setToken_list(tokenList);
4848
pushAppRequest.setSend_time("1111111");

‎src/test/java/com/tencent/xinge/push/app/PushSingleTokenIOSTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void testPushSingleTokenIOS() {
2929

3030
message.setIos(msgIOS);
3131

32-
ArrayList<String> tokenList = new ArrayList<>();
32+
ArrayList<String> tokenList = new ArrayList<String>();
3333
tokenList.add("0d7b5ab1afe4b58973b02a8c80caea51ad6e51f517de6ead3b42576653a69457");
3434

3535
PushAppRequest pushAppRequest = new PushAppRequest();

‎src/test/java/com/tencent/xinge/push/app/PushTagAndroidTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void testPushTagAndroid() {
4040
message.setAndroid(messageAndroid);
4141

4242
PushAppRequest pushAppRequest = new PushAppRequest();
43-
ArrayList<String> tagList = new ArrayList<>();
43+
ArrayList<String> tagList = new ArrayList<String>();
4444
tagList.add("agtestTag");
4545
tagList.add("agtestTag2");
4646
pushAppRequest.setToken_list(tagList);

‎src/test/java/com/tencent/xinge/push/app/PushTagIOSTest.java

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,41 @@ public class PushTagIOSTest extends BaseXgTest {
1313
@Test
1414
public void testPushTagIOS() {
1515

16-
Message message = new Message();
17-
message.setContent("testPushTagIOS from Java API");
18-
message.setTitle("testtest");
19-
20-
21-
MessageIOS msgIOS = new MessageIOS();
22-
Alert alert = new Alert();
23-
alert.setTitle("alert from Java API");
24-
alert.setBody(" body alert from Java API");
25-
26-
Aps aps = new Aps();
27-
aps.setBadge_type(8);
28-
aps.setAlert(alert);
29-
msgIOS.setAps(aps);
30-
31-
message.setIos(msgIOS);
32-
33-
ArrayList<String> tagList = new ArrayList<>();
34-
tagList.add("xg_tag");
35-
tagList.add("xg_tag2");
36-
37-
TagListObject tagListl = new TagListObject();
38-
tagListl.setOp(OpType.OR);
39-
tagListl.setTags(tagList);
40-
41-
PushAppRequest pushAppRequest = new PushAppRequest();
42-
pushAppRequest.setPlatform(Platform.ios);
43-
pushAppRequest.setEnvironment(Environment.dev);
44-
pushAppRequest.setMessage_type(MessageType.notify);
45-
pushAppRequest.setMessage(message);
46-
pushAppRequest.setSend_time("1111111");
47-
pushAppRequest.setStat_tag("test");
48-
pushAppRequest.setPush_id("0");
49-
pushAppRequest.setTag_list(tagListl);
50-
pushAppRequest.setAudience_type(AudienceType.tag);
51-
52-
System.out.println(pushAppRequest.toString());
53-
System.out.println(xingeIOS.pushApp(pushAppRequest.toString()));
16+
Message message = new Message();
17+
message.setContent("testPushTagIOS from Java API");
18+
message.setTitle("testtest");
19+
20+
MessageIOS msgIOS = new MessageIOS();
21+
Alert alert = new Alert();
22+
alert.setTitle("alert from Java API");
23+
alert.setBody(" body alert from Java API");
24+
Aps aps = new Aps();
25+
aps.setBadge_type(8);
26+
aps.setAlert(alert);
27+
msgIOS.setAps(aps);
28+
message.setIos(msgIOS);
29+
30+
ArrayList<String> tagList = new ArrayList<String>();
31+
tagList.add("xg_tag");
32+
tagList.add("xg_tag2");
33+
34+
TagListObject tagListl = new TagListObject();
35+
tagListl.setOp(OpType.OR);
36+
tagListl.setTags(tagList);
37+
38+
PushAppRequest pushAppRequest = new PushAppRequest();
39+
pushAppRequest.setPlatform(Platform.ios);
40+
pushAppRequest.setEnvironment(Environment.dev);
41+
pushAppRequest.setMessage_type(MessageType.notify);
42+
pushAppRequest.setMessage(message);
43+
pushAppRequest.setSend_time("1111111");
44+
pushAppRequest.setStat_tag("test");
45+
pushAppRequest.setPush_id("0");
46+
pushAppRequest.setTag_list(tagListl);
47+
pushAppRequest.setAudience_type(AudienceType.tag);
48+
49+
System.out.println(pushAppRequest.toString());
50+
System.out.println(xingeIOS.pushApp(pushAppRequest.toString()));
5451

5552
}
5653
}

‎src/test/java/com/tencent/xinge/push/app/PushTokenListAndroidTest.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public void testPushTokenListAndroid() {
2121
messageAndroid.setLights(1);
2222
messageAndroid.setIcon_type(0);
2323
messageAndroid.setStyle_id(1);
24-
ClickAction action = new ClickAction();
25-
action.setAction_type(0);
26-
action.setActivity("xxx");
27-
action.setIntent("xxx");
24+
ClickAction action = new ClickAction();
25+
action.setAction_type(0);
26+
action.setActivity("xxx");
27+
action.setIntent("xxx");
2828
messageAndroid.setAction(action);
2929

3030
Message message = new Message();
@@ -39,12 +39,14 @@ public void testPushTokenListAndroid() {
3939
pushAppRequest.setEnvironment(Environment.product);
4040
pushAppRequest.setMessage_type(MessageType.notify);
4141
pushAppRequest.setPlatform(Platform.android);
42-
pushAppRequest.setSeq(123);
43-
pushAppRequest.setPush_id("0");
44-
ArrayList<String> tokenList = new ArrayList<>();
45-
tokenList.add("ece9c2a0fccc41554fcdad95b8a16fe4366d0404");
46-
tokenList.add("acefd718881b48556cd4b1df770401d3f88e424d");
47-
pushAppRequest.setToken_list(tokenList);
42+
pushAppRequest.setSeq(123);
43+
pushAppRequest.setPush_id("0");
44+
45+
ArrayList<String> tokenList = new ArrayList<String>();
46+
tokenList.add("ece9c2a0fccc41554fcdad95b8a16fe4366d0404");
47+
tokenList.add("acefd718881b48556cd4b1df770401d3f88e424d");
48+
49+
pushAppRequest.setToken_list(tokenList);
4850
pushAppRequest.setSend_time("1111111");
4951
pushAppRequest.setStat_tag("test");
5052
pushAppRequest.setMessage(message);

‎src/test/java/com/tencent/xinge/push/app/PushTokenListIOSTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void testPushTokenListIOS() {
2929

3030
message.setIos(msgIOS);
3131

32-
ArrayList<String> tokenList = new ArrayList<>();
32+
ArrayList<String> tokenList = new ArrayList<String>();
3333
tokenList.add("0d7b5ab1afe4b58973b02a8c80caea51ad6e51f517de6ead3b42576653a69457");
3434
tokenList.add("22a3bad291f1a8028d0468ecc00eb7f3818b859b7ec3a0f8b8f584a22d938cf2");
3535

0 commit comments

Comments
 (0)