Skip to content

Commit 500acbc

Browse files
author
Javen
committed
Adjust classes package for tests.
1 parent 536e495 commit 500acbc

File tree

9 files changed

+46
-105
lines changed

9 files changed

+46
-105
lines changed

‎pom.xml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>cn.jpush.api</groupId>
55
<artifactId>jpush-client</artifactId>
6-
<version>3.1.4-SNAPSHOT</version>
6+
<version>3.2.0-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<url>https://github.com/jpush/jpush-api-java-client</url>
99
<name>JPush API Java Client</name>
@@ -20,8 +20,10 @@
2020
<properties>
2121
<github.global.server>github</github.global.server>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23+
<jdkVersion>1.6</jdkVersion>
24+
<jdkVersion.test>1.8</jdkVersion.test>
2325
</properties>
24-
26+
2527
<parent>
2628
<groupId>org.sonatype.oss</groupId>
2729
<artifactId>oss-parent</artifactId>
@@ -41,29 +43,33 @@
4143
<artifactId>gson</artifactId>
4244
<version>2.3</version>
4345
</dependency>
46+
4447
<dependency>
4548
<groupId>com.google.guava</groupId>
4649
<artifactId>guava</artifactId>
4750
<version>17.0</version>
4851
</dependency>
52+
4953
<dependency>
5054
<groupId>org.slf4j</groupId>
5155
<artifactId>slf4j-api</artifactId>
5256
<version>1.7.7</version>
5357
</dependency>
5458

59+
60+
<!-- Test Dependencies -->
61+
5562
<dependency>
5663
<groupId>org.slf4j</groupId>
5764
<artifactId>slf4j-log4j12</artifactId>
5865
<version>1.7.7</version>
59-
<scope>test</scope>
6066
</dependency>
6167
<dependency>
6268
<groupId>log4j</groupId>
6369
<artifactId>log4j</artifactId>
6470
<version>1.2.17</version>
65-
<scope>test</scope>
6671
</dependency>
72+
6773
<dependency>
6874
<groupId>junit</groupId>
6975
<artifactId>junit</artifactId>
@@ -86,8 +92,16 @@
8692
<artifactId>maven-compiler-plugin</artifactId>
8793
<version>3.1</version>
8894
<configuration>
89-
<source>1.8</source>
90-
<target>1.6</target>
95+
<source>${jdkVersion}</source>
96+
<target>${jdkVersion}</target>
97+
<compilerVersion>1.5</compilerVersion>
98+
<showDeprecation>true</showDeprecation>
99+
<showWarnings>true</showWarnings>
100+
<debug>true</debug>
101+
<fork>true</fork>
102+
<compilerArgs>
103+
<arg>-Xlint:unchecked</arg>
104+
</compilerArgs>
91105
</configuration>
92106
</plugin>
93107

@@ -137,6 +151,7 @@
137151
<artifactId>maven-surefire-plugin</artifactId>
138152
<version>2.16</version>
139153
<configuration>
154+
<argLine>-Dfile.encoding=UTF-8</argLine>
140155
<excludes>
141156
<exclude>**/mock/*Test.java</exclude>
142157
</excludes>

‎src/cn/jpush/api/examples/DevcieExample.java‎

Lines changed: 3 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,24 @@
11
package cn.jpush.api.examples;
22

3-
import static org.junit.Assert.assertTrue;
4-
5-
import java.util.HashSet;
6-
import java.util.Set;
7-
83
import org.slf4j.Logger;
94
import org.slf4j.LoggerFactory;
105

116
import cn.jpush.api.JPushClient;
12-
import cn.jpush.api.common.resp.APIConnectionException;
13-
import cn.jpush.api.common.resp.APIRequestException;
14-
import cn.jpush.api.common.resp.BooleanResult;
15-
import cn.jpush.api.common.resp.DefaultResult;
16-
import cn.jpush.api.device.AliasDeviceListResult;
17-
import cn.jpush.api.device.TagAliasResult;
18-
import cn.jpush.api.device.TagListResult;
197

208
public class DevcieExample {
219
protected static final Logger LOG = LoggerFactory.getLogger(DevcieExample.class);
2210

2311
private static final String appKey = "dd1066407b044738b6479275";
2412
private static final String masterSecret = "2b38ce69b1de2a7fa95706ea";
25-
private static JPushClient jpushClient = new JPushClient(masterSecret, appKey, 3);
2613
private static final String TAG1 = "tag1";
2714
private static final String ALIAS1 = "alias1";
2815
private static final String ALIAS2 = "alias2";
2916
private static final String REGISTRATION_ID1 = "0900e8d85ef";
3017
private static final String REGISTRATION_ID2 = "0a04ad7d8b4";
3118

19+
private static JPushClient jpushClient = new JPushClient(masterSecret, appKey, 3);
3220

33-
public static void main(String[] args) throws Exception {
34-
testGetDeviceTagAlias();
35-
testUpdateDeviceTagAlias();
36-
testGetTagList();
37-
testIsDeviceInTag();
38-
testAddRemoveDevicesFromTag();
39-
testDeleteTag();
40-
testGetAliasDeviceList();
41-
testDeleteAlias();
42-
}
43-
public static void testGetDeviceTagAlias() throws Exception {
44-
TagAliasResult result = jpushClient.getDeviceTagAlias(REGISTRATION_ID1);
45-
assertTrue(result.isResultOK());
46-
}
47-
48-
public static void testUpdateDeviceTagAlias()
49-
throws APIConnectionException, APIRequestException {
50-
Set<String> tagsToAdd = new HashSet<String>();
51-
tagsToAdd.add("tag2");
52-
tagsToAdd.add("tag2");
53-
Set<String> tagsToRemove = new HashSet<String>();
54-
tagsToRemove.add("tag4");
55-
tagsToRemove.add("tag3");
56-
DefaultResult result = jpushClient.updateDeviceTagAlias(
57-
REGISTRATION_ID1, ALIAS1, tagsToAdd, tagsToRemove);
58-
assertTrue(result.isResultOK());
59-
}
60-
61-
public static void testGetTagList() throws APIConnectionException,
62-
APIRequestException {
63-
TagListResult result = jpushClient.getTagList();
64-
assertTrue(result.isResultOK());
65-
}
66-
67-
public static void testIsDeviceInTag() throws APIConnectionException,
68-
APIRequestException {
69-
BooleanResult result = jpushClient
70-
.isDeviceInTag(TAG1, REGISTRATION_ID1);
71-
assertTrue(result.isResultOK());
72-
}
73-
74-
public static void testAddRemoveDevicesFromTag()
75-
throws APIConnectionException, APIRequestException {
76-
Set<String> toAddUsers = new HashSet<String>();
77-
toAddUsers.add(REGISTRATION_ID1);
78-
Set<String> toRemoveUsers = new HashSet<String>();
79-
toRemoveUsers.add(REGISTRATION_ID2);
80-
DefaultResult result = jpushClient.addRemoveDevicesFromTag(TAG1,
81-
toAddUsers, toRemoveUsers);
82-
assertTrue(result.isResultOK());
83-
}
84-
85-
public static void testDeleteTag() throws APIConnectionException,
86-
APIRequestException {
87-
DefaultResult result = jpushClient.deleteTag(TAG1, null);
88-
assertTrue(result.isResultOK());
89-
}
90-
91-
public static void testGetAliasDeviceList() throws APIConnectionException,
92-
APIRequestException {
93-
AliasDeviceListResult result = jpushClient.getAliasDeviceList(ALIAS1,
94-
null);
95-
assertTrue(result.isResultOK());
96-
}
97-
98-
public static void testDeleteAlias() throws APIConnectionException,
99-
APIRequestException {
100-
DefaultResult result = jpushClient.deleteAlias(ALIAS2, null);
101-
assertTrue(result.isResultOK());
21+
public static void main(String[] args) {
22+
10223
}
10324
}

‎src/cn/jpush/api/push/PushClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public PushResult sendPush(PushPayload pushPayload) throws APIConnectionExceptio
110110

111111
ResponseWrapper response = _httpClient.sendPost(_baseUrl + PUSH_PATH, pushPayload.toString());
112112

113-
return PushResult.fromResponse(response);
113+
return BaseResult.fromResponse(response, PushResult.class);
114114
}
115115

116116
public PushResult sendPushValidate(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
@@ -137,7 +137,7 @@ public PushResult sendPush(String payloadString) throws APIConnectionException,
137137

138138
ResponseWrapper response = _httpClient.sendPost(_baseUrl + PUSH_PATH, payloadString);
139139

140-
return PushResult.fromResponse(response);
140+
return BaseResult.fromResponse(response, PushResult.class);
141141
}
142142

143143
public PushResult sendPushValidate(String payloadString) throws APIConnectionException, APIRequestException {

src/cn/jpush/api/utils/JUnitOrderedRunner.java renamed to test/cn/jpush/api/JUnitOrderedRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.jpush.api.utils;
1+
package cn.jpush.api;
22

33
import java.util.Collections;
44
import java.util.Comparator;

src/cn/jpush/api/utils/TestOrder.java renamed to test/cn/jpush/api/TestOrder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.jpush.api.utils;
1+
package cn.jpush.api;
22

33
import java.lang.annotation.Retention;
44
import java.lang.annotation.RetentionPolicy;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import org.junit.runner.RunWith;
1212

1313
import cn.jpush.api.BaseTest;
14+
import cn.jpush.api.JUnitOrderedRunner;
15+
import cn.jpush.api.TestOrder;
1416
import cn.jpush.api.common.resp.APIConnectionException;
1517
import cn.jpush.api.common.resp.APIRequestException;
1618
import cn.jpush.api.common.resp.BooleanResult;
1719
import cn.jpush.api.common.resp.DefaultResult;
18-
import cn.jpush.api.utils.JUnitOrderedRunner;
19-
import cn.jpush.api.utils.TestOrder;
2020

2121
@RunWith(JUnitOrderedRunner.class)
2222
public class DeviceNormalRemoteTest extends BaseTest {

‎test/cn/jpush/api/push/PushClientTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
import org.junit.Test;
77

8-
import cn.jpush.api.common.APIConnectionException;
9-
import cn.jpush.api.common.APIRequestException;
10-
import cn.jpush.api.common.HttpProxy;
11-
import cn.jpush.api.push.model.PushPayload;
128
import cn.jpush.api.BaseTest;
9+
import cn.jpush.api.common.connection.HttpProxy;
10+
import cn.jpush.api.common.resp.APIConnectionException;
11+
import cn.jpush.api.common.resp.APIRequestException;
12+
import cn.jpush.api.push.model.PushPayload;
1313

1414
public class PushClientTest extends BaseTest {
1515

@@ -46,7 +46,7 @@ public void test_empty_password() {
4646

4747
@Test
4848
public void test_validate() {
49-
PushClient pushClient = new PushClient(masterSecret, appKey);
49+
PushClient pushClient = new PushClient(MASTER_SECRET, APP_KEY);
5050

5151
try {
5252
PushResult result = pushClient.sendPushValidate(PushPayload.alertAll("alert"));

‎test/cn/jpush/api/push/model/PushPayloadTest.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,23 +101,26 @@ public void testMessage() {
101101

102102
@Test
103103
public void testGlobalExceed() {
104-
System.out.println("Size of long text - " + LONG_TEXT_2.getBytes().length);
105104
PushPayload payload = PushPayload.newBuilder()
106105
.setPlatform(Platform.all())
107106
.setAudience(Audience.all())
108107
.setMessage(Message.content(LONG_TEXT_2))
109108
.build();
110-
Assert.assertTrue("Should exceed", payload.isGlobalExceedLength());
109+
System.out.println("Size: " + LONG_TEXT_2.getBytes().length);
110+
Assert.assertTrue("Should exceed - " + LONG_TEXT_2.getBytes().length,
111+
payload.isGlobalExceedLength());
111112
}
112-
113+
113114
@Test
114115
public void testIosExceed() {
115116
PushPayload payload = PushPayload.newBuilder()
116117
.setPlatform(Platform.all())
117118
.setAudience(Audience.all())
118119
.setNotification(Notification.alert(LONG_TEXT_1))
119120
.build();
120-
Assert.assertTrue("Should exceed", payload.isIosExceedLength());
121+
System.out.println("Size: " + LONG_TEXT_1.getBytes().length);
122+
Assert.assertTrue("Should exceed - " + LONG_TEXT_1.getBytes().length,
123+
payload.isIosExceedLength());
121124
}
122125

123126
@Test
@@ -128,7 +131,9 @@ public void testIosExceed2() {
128131
.setNotification(Notification.newBuilder().addPlatformNotification(
129132
IosNotification.alert(LONG_TEXT_1)).build())
130133
.build();
131-
Assert.assertTrue("Should exceed", payload.isIosExceedLength());
134+
System.out.println("Size: " + LONG_TEXT_1.getBytes().length);
135+
Assert.assertTrue("Should exceed - " + LONG_TEXT_1.getBytes().length,
136+
payload.isIosExceedLength());
132137
}
133138

134139

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void sendSimpleMessage_Pios() throws Exception {
150150
assertTrue(result.isResultOK());
151151
}
152152

153-
@Test
153+
//@Test
154154
public void sendSimpleMessage_Pwinphone() throws Exception {
155155
PushPayload payload = PushPayload.newBuilder()
156156
.setPlatform(Platform.winphone())

0 commit comments

Comments
 (0)