Refine - add push param checking, and add tests.

Author: Javen

src/cn/jpush/api/common/HttpProxy.java

@@ -19,17 +19,20 @@ public class HttpProxy {
     public HttpProxy(String host, int port) {
         this.host = host;
         this.port = port;
-        
-        LOG.info("Http Proxy - host:" + host + ", port:" + port);
     }
 
     public HttpProxy(String host, int port, String username, String password) {
         this(host, port);
+        
         this.username = username;
         this.password = password;
         authenticationNeeded = true;
+        
+        LOG.info("Http Proxy - host:" + host + ", port:" + port
+                + ", username:" + username + ", password:" + password);
     }
 
+    
     public Proxy getNetProxy() {
         return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
     }

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

@@ -8,6 +8,11 @@
 import cn.jpush.api.common.ResponseWrapper;
 import cn.jpush.api.common.ServiceHelper;
 import cn.jpush.api.push.model.PushPayload;
+import cn.jpush.api.utils.StringUtils;
+
+import com.google.common.base.Preconditions;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
 
 /**
  * Entrance for sending Push.
@@ -24,7 +29,8 @@ public class PushClient {
     public static final String PUSH_PATH = "/v3/push";
 
     private final NativeHttpClient _httpClient;
-    
+    private JsonParser _jsonParser = new JsonParser();
+
     // If not present, true by default.
     private boolean _apnsProduction = true;
 
@@ -78,6 +84,7 @@ public PushClient(String masterSecret, String appKey, int maxRetryTimes, HttpPro
      */
     public PushClient(String masterSecret, String appKey, boolean apnsProduction, long timeToLive) {
         this(masterSecret, appKey);
+        
         this._apnsProduction = apnsProduction;
         this._timeToLive = timeToLive;
         this._globalSettingEnabled = true;
@@ -88,6 +95,8 @@ public void setBaseUrl(String baseUrl) {
     }
 
     public PushResult sendPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
+        Preconditions.checkArgument(! (null == pushPayload), "pushPayload should not be null");
+        
         if (_globalSettingEnabled) {
             pushPayload.resetOptionsTimeToLive(_timeToLive);
             pushPayload.resetOptionsApnsProduction(_apnsProduction);
@@ -99,6 +108,15 @@ public PushResult sendPush(PushPayload pushPayload) throws APIConnectionExceptio
     }
 
     public PushResult sendPush(String payloadString) throws APIConnectionException, APIRequestException {
+        Preconditions.checkArgument(StringUtils.isNotEmpty(payloadString), "pushPayload should not be empty");
+        
+        try {
+            _jsonParser.parse(payloadString);
+        } catch (JsonParseException e) {
+            e.printStackTrace();
+            Preconditions.checkArgument(false, "payloadString should be a valid JSON string.");
+        }
+        
         ResponseWrapper response = _httpClient.sendPost(_baseUrl, payloadString);
 
         return PushResult.fromResponse(response);

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

@@ -0,0 +1,42 @@
+package cn.jpush.api.push;
+
+import org.junit.Test;
+
+import cn.jpush.api.common.APIConnectionException;
+import cn.jpush.api.common.APIRequestException;
+
+public class PushClientTest {
+    private static final String appKey ="dd1066407b044738b6479275";
+    private static final String masterSecret = "2b38ce69b1de2a7fa95706ea";
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test_invalid_json() {
+        PushClient pushClient = new PushClient(masterSecret, appKey);
+        
+        try {
+            pushClient.sendPush("{aaa:'a}");
+        } catch (APIConnectionException e) {
+            e.printStackTrace();
+        } catch (APIRequestException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void test_empty_string() {
+        PushClient pushClient = new PushClient(masterSecret, appKey);
+        
+        try {
+            pushClient.sendPush("");
+        } catch (APIConnectionException e) {
+            e.printStackTrace();
+        } catch (APIRequestException e) {
+            e.printStackTrace();
+        }
+    }    
+
+    
+    
+    
+
+}