Changed to mpns notification.

Author: Javen

…l/notification/WinPhoneNotification.java …model/notification/MpnsNotification.javasrc/cn/jpush/api/push/model/notification/WinPhoneNotification.java renamed to src/cn/jpush/api/push/model/notification/MpnsNotification.java src/cn/jpush/api/push/model/notification/WinPhoneNotification.java renamed to src/cn/jpush/api/push/model/notification/MpnsNotification.java

@@ -8,8 +8,8 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-public class WinPhoneNotification extends PlatformNotification {
-    public static final String NOTIFICATION_WINPHONE = "winphone";
+public class MpnsNotification extends PlatformNotification {
+    public static final String NOTIFICATION_MPNS = "mpns";
 
     public static final String TITLE = "title";
     public static final String EXTRAS = "extras";
@@ -19,7 +19,7 @@ public class WinPhoneNotification extends PlatformNotification {
     private final String openPage;
     private final ImmutableMap<String, String> extras;
 
-    private WinPhoneNotification(String alert, String title, String openPage, 
+    private MpnsNotification(String alert, String title, String openPage, 
             ImmutableMap<String, String> extras) {
         super(alert);
         this.title = title;
@@ -31,14 +31,14 @@ public static Builder newBuilder() {
         return new Builder();
     }
 
-    public static WinPhoneNotification alert(String alert) {
+    public static MpnsNotification alert(String alert) {
         return newBuilder().setAlert(alert).build();
     }
 
 
     @Override
     public String getPlatform() {
-        return NOTIFICATION_WINPHONE;
+        return NOTIFICATION_MPNS;
     }
 
     @Override
@@ -106,8 +106,8 @@ public Builder addExtra(String key, String value) {
             return this;
         }
 
-        public WinPhoneNotification build() {
-            return new WinPhoneNotification(alert, title, openPage, 
+        public MpnsNotification build() {
+            return new MpnsNotification(alert, title, openPage, 
                     (null == extrasBuilder) ? null : extrasBuilder.build());
         }
     }

…ification/WinPhoneNotificationTests.java …/notification/MpnsNotificationTests.javatest/cn/jpush/api/push/model/notification/WinPhoneNotificationTests.java renamed to test/cn/jpush/api/push/model/notification/MpnsNotificationTests.java test/cn/jpush/api/push/model/notification/WinPhoneNotificationTests.java renamed to test/cn/jpush/api/push/model/notification/MpnsNotificationTests.java

@@ -6,33 +6,33 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-public class WinPhoneNotificationTests {
+public class MpnsNotificationTests {
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegal() {
-        WinPhoneNotification mpns = WinPhoneNotification.newBuilder().build();
+        MpnsNotification mpns = MpnsNotification.newBuilder().build();
         Assert.assertEquals("", "", mpns.toJSON());
     }
 
     @Test
     public void testQuickAlert() {
-        WinPhoneNotification mpns = WinPhoneNotification.alert("aaa");
+        MpnsNotification mpns = MpnsNotification.alert("aaa");
         JsonObject json = new JsonObject();
         json.add("alert", new JsonPrimitive("aaa"));
         Assert.assertEquals("", json, mpns.toJSON());
     }
 
     @Test
     public void testTitle() {
-        WinPhoneNotification mpns = WinPhoneNotification.newBuilder().setTitle("title").build();
+        MpnsNotification mpns = MpnsNotification.newBuilder().setTitle("title").build();
         JsonObject json = new JsonObject();
         json.add("title", new JsonPrimitive("title"));
         Assert.assertEquals("", json, mpns.toJSON());
     }
 
     @Test
     public void testExtra() {
-        WinPhoneNotification mpns = WinPhoneNotification.newBuilder().addExtra("key", "value").build();
+        MpnsNotification mpns = MpnsNotification.newBuilder().addExtra("key", "value").build();
         JsonObject json = new JsonObject();
         JsonObject extra = new JsonObject();
         extra.add("key", new JsonPrimitive("value"));

test/cn/jpush/api/push/model/notification/NotificationTests.java

@@ -21,7 +21,7 @@ public void testIllegal() {
                 .build();
         Assert.assertEquals("", "", notification.toJSON());
     }
-        
+    
     @Test
     public void testAlertAndroid() {
         Notification notification = Notification.newBuilder()
@@ -34,6 +34,31 @@ public void testAlertAndroid() {
         Assert.assertEquals("", json, notification.toJSON());
     }
 
+    @Test
+    public void testAlertIos() {
+        Notification notification = Notification.newBuilder()
+                .addPlatformNotification(IosNotification.alert("alert"))
+                .build();
+        JsonObject json = new JsonObject();
+        JsonObject ios = new JsonObject();
+        ios.add("alert", new JsonPrimitive("alert"));
+        ios.add("sound", new JsonPrimitive(""));
+        json.add("ios", ios);
+        Assert.assertEquals("", json, notification.toJSON());
+    }
+    
+    @Test
+    public void testAlertMpns() {
+        Notification notification = Notification.newBuilder()
+                .addPlatformNotification(MpnsNotification.alert("alert"))
+                .build();
+        JsonObject json = new JsonObject();
+        JsonObject mpns = new JsonObject();
+        mpns.add("alert", new JsonPrimitive("alert"));
+        json.add("mpns", mpns);
+        Assert.assertEquals("", json, notification.toJSON());
+    }
+    
     @Test
     public void testAlertAll() {
         Notification notification = Notification.alert("alert");