Merge pull request #838 from Iterable/evan/MOB-10109-update-merge-tests

[MOB-10098] fixes update user bug

Author: evantk91

iterableapi/src/main/java/com/iterable/iterableapi/AnonymousUserManager.java

@@ -207,8 +207,10 @@ private void createAnonymousUser(String criteriaId) {
         try {
             if (!userData.isEmpty()) {
                 JSONObject updateUserObj = getUserUpdateObjFromLocalStorage();
-                JSONObject updateUserDataFields = updateUserObj.getJSONObject(IterableConstants.KEY_DATA_FIELDS);
-
+                JSONObject updateUserDataFields = null;
+                if (updateUserObj.has(IterableConstants.KEY_DATA_FIELDS)) {
+                    updateUserDataFields = updateUserObj.getJSONObject(IterableConstants.KEY_DATA_FIELDS);
+                }
                 JSONObject userSessionDataJson = new JSONObject(userData);
                 JSONObject userDataJson = userSessionDataJson.getJSONObject(IterableConstants.SHARED_PREFS_ANON_SESSIONS);
 

iterableapi/src/test/java/com/iterable/iterableapi/IterableApiMergeUserEmailTests.java

@@ -239,7 +239,7 @@ public void testCriteriaNotMetUserIdReplayFalseMergeFalse() throws Exception {
         shadowOf(getMainLooper()).idle();
         assertNotEquals(("/" + IterableConstants.ENDPOINT_MERGE_USER), mergeRequest.getPath());
         assertEquals(userId, IterableApi.getInstance().getUserId());
-        assertEquals(eventData, getEventData());
+        assertEquals("", getEventData());
     }
 
     @Test
@@ -261,7 +261,7 @@ public void testCriteriaNotMetUserIdReplayFalseMergeTrue() throws Exception {
         shadowOf(getMainLooper()).idle();
         assertNotEquals(("/" + IterableConstants.ENDPOINT_MERGE_USER), mergeRequest.getPath());
         assertEquals(userId, IterableApi.getInstance().getUserId());
-        assertEquals(eventData, getEventData());
+        assertEquals("", getEventData());
     }
 
     @Test
@@ -401,7 +401,7 @@ public void testCriteriaNotMetEmailMergeFalse() throws Exception {
         shadowOf(getMainLooper()).idle();
         assertNotEquals(("/" + IterableConstants.ENDPOINT_MERGE_USER), mergeRequest.getPath());
         assertEquals(email, IterableApi.getInstance().getEmail());
-        assertEquals(eventData, getEventData());
+        assertEquals("", getEventData());
     }
 
     @Test
@@ -484,7 +484,7 @@ public void testCriteriaNotMetEmailReplayFalseMergeFalse() throws Exception {
         shadowOf(getMainLooper()).idle();
         assertNotEquals(("/" + IterableConstants.ENDPOINT_MERGE_USER), mergeRequest.getPath());
         assertEquals(email, IterableApi.getInstance().getEmail());
-        assertEquals(eventData, getEventData());
+        assertEquals("", getEventData());
     }
 
     @Test
@@ -506,7 +506,7 @@ public void testCriteriaNotMetEmailReplayFalseMergeTrue() throws Exception {
         shadowOf(getMainLooper()).idle();
         assertNotEquals(("/" + IterableConstants.ENDPOINT_MERGE_USER), mergeRequest.getPath());
         assertEquals(email, IterableApi.getInstance().getEmail());
-        assertEquals(eventData, getEventData());
+        assertEquals("", getEventData());
     }
 
     @Test