1. Always set apns_production option

2. Set apns_production to false by default   (dev env)

Author: Javen

src/cn/jpush/api/push/model/Options.java

@@ -61,17 +61,17 @@ public JsonElement toJSON() {
         if (timeToLive > 0) {
             json.add(TIME_TO_LIVE, new JsonPrimitive(timeToLive));
         }
-        if (!apnsProduction) {
-            json.add(APNS_PRODUCTION, new JsonPrimitive(apnsProduction));
-        }
+        
+        json.add(APNS_PRODUCTION, new JsonPrimitive(apnsProduction));
+        
         return json;
     }
 
     public static class Builder {
         private int sendno = 0;
         private long overrideMsgId = 0;
         private long timeToLive = 0;
-        private boolean apnsProduction = true;
+        private boolean apnsProduction = false;
 
         public Builder setSendno(int sendno) {
             this.sendno = sendno;

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

@@ -30,12 +30,13 @@ public void testIllegalTimeToLive() {
     public void testSendno() {
         JsonObject json = new JsonObject();
         json.add("sendno", new JsonPrimitive(111));
-        Options optional = Options.newBuilder().setSendno(111).build();
-        Assert.assertEquals("", json, optional.toJSON());
+        json.add("apns_production", new JsonPrimitive(false));
+        Options options = Options.newBuilder().setSendno(111).build();
+        Assert.assertEquals("", json, options.toJSON());
     }
 
     @Test
-    public void testApnsProduction() {
+    public void testApnsProduction_defaultFalse() {
         int sendno = ServiceHelper.generateSendno();
 
         JsonObject json = new JsonObject();
@@ -44,10 +45,27 @@ public void testApnsProduction() {
 
         Options options = Options.newBuilder()
                 .setSendno(sendno)
-                .setApnsProduction(false).build();
+                .build();
+        
+        Assert.assertEquals("", json, options.toJSON());
+    }
+    
+    @Test
+    public void testApnsProduction_True() {
+        int sendno = ServiceHelper.generateSendno();
+
+        JsonObject json = new JsonObject();
+        json.add("apns_production", new JsonPrimitive(true));
+        json.add("sendno", new JsonPrimitive(sendno));
+        
+        Options options = Options.newBuilder()
+                .setSendno(sendno)
+                .setApnsProduction(true)
+                .build();
 
         Assert.assertEquals("", json, options.toJSON());
     }
 
+
 }
 

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

@@ -67,6 +67,7 @@ public void testNotification() {
 
         JsonObject options = new JsonObject();
         options.add("sendno", new JsonPrimitive(sendno));
+        options.add("apns_production", new JsonPrimitive(false));
         json.add("options", options);
 
         Assert.assertEquals("", json, payload.toJSON());
@@ -91,6 +92,7 @@ public void testMessage() {
 
         JsonObject options = new JsonObject();
         options.add("sendno", new JsonPrimitive(sendno));
+        options.add("apns_production", new JsonPrimitive(false));
         json.add("options", options);
 
         Assert.assertEquals("", json, payload.toJSON());