Add package-info.java for docs; tiny refactor code.

Author: Javen

pom.xml

@@ -41,33 +41,35 @@
 			<artifactId>gson</artifactId>
 			<version>2.3</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>17.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>1.7.7</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.7.7</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>1.2.17</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>17.0</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.squareup.okhttp</groupId>
 			<artifactId>mockwebserver</artifactId>

src/cn/jpush/api/examples/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Examples for demo API usage. 
+ */
+package cn.jpush.api.examples;

src/cn/jpush/api/push/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Push API features.
+ * 
+ * Url: https://api.jpush.cn/v3/push
+ */
+package cn.jpush.api.push;

src/cn/jpush/api/push/package.html

@@ -0,0 +1,6 @@
+/**
+ * Report API features.
+ * 
+ * Url: https://report.jpush.cn/v3/report/
+ */
+package cn.jpush.api.report;

src/cn/jpush/api/report/package-info.java

@@ -1,11 +1,14 @@
 package cn.jpush.api.push.model;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Assert;
 import org.junit.Test;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
@@ -23,8 +26,7 @@ public void testMsgContent() {
         JsonObject json = new JsonObject();
         json.add("msg_content", new JsonPrimitive("msg content"));
 
-        Assert.assertEquals("", json, message.toJSON());
-
+        assertThat(message.toJSON(), is((JsonElement) json));
     }
 
     @Test
@@ -45,7 +47,7 @@ public void testMsgContentAndExtras() {
 
         json.add("extras", extras);
 
-        Assert.assertEquals("", json, message.toJSON());
+        assertThat(message.toJSON(), is((JsonElement) json));
     }
 
     @Test
@@ -66,8 +68,7 @@ public void testMsgContentAndExtrasMap() {
         extras.add("key2", new JsonPrimitive("value2"));
         json.add("extras", extras);
 
-        Assert.assertEquals("", json, message.toJSON());
-
+        assertThat(message.toJSON(), is((JsonElement) json));
     }
 
 

test/cn/jpush/api/push/model/MessageTest.java

@@ -1,10 +1,13 @@
 package cn.jpush.api.push.model;
 
-import org.junit.Assert;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 import org.junit.Test;
 
 import cn.jpush.api.common.ServiceHelper;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
@@ -31,7 +34,8 @@ public void testSendno() {
         json.add("sendno", new JsonPrimitive(111));
         json.add("apns_production", new JsonPrimitive(false));
         Options options = Options.newBuilder().setSendno(111).build();
-        Assert.assertEquals("", json, options.toJSON());
+        
+        assertThat(options.toJSON(), is((JsonElement) json));
     }
 
     @Test
@@ -44,7 +48,8 @@ public void testTimeToLive_int() {
         Options options = Options.newBuilder()
                 .setSendno(111)
                 .setTimeToLive(640).build();
-        Assert.assertEquals("", json, options.toJSON());
+        
+        assertThat(options.toJSON(), is((JsonElement) json));
     }
 
     @Test
@@ -57,7 +62,8 @@ public void testTimeToLive_0() {
         Options options = Options.newBuilder()
                 .setSendno(111)
                 .setTimeToLive(0).build();
-        Assert.assertEquals("", json, options.toJSON());
+        
+        assertThat(options.toJSON(), is((JsonElement) json));
     }
 
     @Test
@@ -69,7 +75,8 @@ public void testTimeToLive_default() {
         Options options = Options.newBuilder()
                 .setSendno(111)
                 .setTimeToLive(-1).build();
-        Assert.assertEquals("", json, options.toJSON());
+        
+        assertThat(options.toJSON(), is((JsonElement) json));
     }
 
     @Test
@@ -84,7 +91,7 @@ public void testApnsProduction_defaultFalse() {
                 .setSendno(sendno)
                 .build();
 
-        Assert.assertEquals("", json, options.toJSON());
+        assertThat(options.toJSON(), is((JsonElement) json));
     }
 
     @Test
@@ -100,7 +107,7 @@ public void testApnsProduction_True() {
                 .setApnsProduction(true)
                 .build();
 
-        Assert.assertEquals("", json, options.toJSON());
+        assertThat(options.toJSON(), is((JsonElement) json));
     }
 
 

test/cn/jpush/api/push/model/OptionsTest.java

@@ -1,12 +1,15 @@
 package cn.jpush.api.push.model;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 import org.junit.Assert;
 import org.junit.Test;
 
 import cn.jpush.api.common.DeviceType;
-import cn.jpush.api.push.model.Platform;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 
 public class PlatformTesst {
@@ -20,15 +23,17 @@ public void testAll() {
     @Test(expected = IllegalArgumentException.class)
     public void testNotAll() {
         Platform all = Platform.newBuilder().setAll(false).build();
-        Assert.assertNotEquals("test", new JsonPrimitive("all"), all.toJSON());
+        
+        assertThat(all.toJSON(), is((JsonElement) new JsonPrimitive("all")));
     }
 
     @Test
     public void testAndroid() {
         Platform android = Platform.newBuilder().addDeviceType(DeviceType.Android).build();
         JsonArray array = new JsonArray();
         array.add(new JsonPrimitive("android"));
-        Assert.assertEquals("test", array, android.toJSON());
+        
+        assertThat(android.toJSON(), is((JsonElement) array));
     }
 
 }