Add unit tests for ParsePush.State copying

Author: grantland

Parse/src/main/java/com/parse/ParsePush.java

@@ -59,21 +59,21 @@ public Builder() {
         // do nothing
       }
 
-      private Builder(State state) {
-        this.channelSet = state.channelSet == null
+      public Builder(State state) {
+        this.channelSet = state.channelSet() == null
             ? null
-            : Collections.unmodifiableSet(new HashSet<>(state.channelSet));
-        this.query = state.queryState == null
+            : Collections.unmodifiableSet(new HashSet<>(state.channelSet()));
+        this.query = state.queryState() == null
             ? null
-            : new ParseQuery<>(new ParseQuery.State.Builder<ParseInstallation>(state.queryState));
-        this.expirationTime = state.expirationTime;
-        this.expirationTimeInterval = state.expirationTimeInterval;
-        this.pushToIOS = state.pushToIOS;
-        this.pushToAndroid = state.pushToAndroid;
+            : new ParseQuery<>(new ParseQuery.State.Builder<ParseInstallation>(state.queryState()));
+        this.expirationTime = state.expirationTime();
+        this.expirationTimeInterval = state.expirationTimeInterval();
+        this.pushToIOS = state.pushToIOS();
+        this.pushToAndroid = state.pushToAndroid();
         // Since in state.build() we check data is not null, we do not need to check it again here.
         JSONObject copyData = null;
         try {
-          copyData = new JSONObject(state.data.toString());
+          copyData = new JSONObject(state.data().toString());
         } catch (JSONException e) {
           // Swallow this silently since it is impossible to happen
         }

Parse/src/test/java/com/parse/ParsePushStateTest.java

@@ -8,8 +8,10 @@
  */
 package com.parse;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
+import org.mockito.internal.util.collections.Sets;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
@@ -20,8 +22,13 @@
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class ParsePushStateTest {
 
@@ -56,6 +63,38 @@ public void testDefaultsWithData() throws Exception {
 
   //endregion
 
+  @Test
+  public void testCopy() throws JSONException {
+    ParsePush.State state = mock(ParsePush.State.class);
+    when(state.expirationTime()).thenReturn(1L);
+    when(state.expirationTimeInterval()).thenReturn(2L);
+    Set channelSet = Sets.newSet("one", "two");
+    when(state.channelSet()).thenReturn(channelSet);
+    JSONObject data = new JSONObject();
+    data.put("foo", "bar");
+    when(state.data()).thenReturn(data);
+    when(state.pushToAndroid()).thenReturn(true);
+    when(state.pushToIOS()).thenReturn(false);
+    ParseQuery.State<ParseInstallation> queryState =
+        new ParseQuery.State.Builder<>(ParseInstallation.class).build();
+    when(state.queryState()).thenReturn(queryState);
+
+    ParsePush.State copy = new ParsePush.State.Builder(state).build();
+    assertSame(1L, copy.expirationTime());
+    assertSame(2L, copy.expirationTimeInterval());
+    Set channelSetCopy = copy.channelSet();
+    assertNotSame(channelSet, channelSetCopy);
+    assertTrue(channelSetCopy.size() == 2 && channelSetCopy.contains("one"));
+    JSONObject dataCopy = copy.data();
+    assertNotSame(data, dataCopy);
+    assertEquals("bar", dataCopy.get("foo"));
+    assertTrue(copy.pushToAndroid());
+    assertFalse(copy.pushToIOS());
+    ParseQuery.State<ParseInstallation> queryStateCopy = copy.queryState();
+    assertNotSame(queryState, queryStateCopy);
+    assertEquals("_Installation", queryStateCopy.className());
+  }
+
   //region testExpirationTime
 
   @Test