Add test for remove external id

* Test if auth hash is being added for remove external id

Author: Jeasmine

OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -223,6 +223,22 @@ public void onComplete(JSONObject results) {
       };
    }
 
+   private static boolean didEmailUpdateSucceed;
+   private static OneSignal.EmailUpdateError lastEmailUpdateFailure;
+   private static OneSignal.EmailUpdateHandler getEmailUpdateHandler() {
+      return new OneSignal.EmailUpdateHandler() {
+         @Override
+         public void onSuccess() {
+            didEmailUpdateSucceed = true;
+         }
+
+         @Override
+         public void onFailure(OneSignal.EmailUpdateError error) {
+            lastEmailUpdateFailure = error;
+         }
+      };
+   }
+
    private static void GetTags() {
       OneSignal.getTags(new OneSignal.GetTagsHandler() {
          @Override
@@ -237,7 +253,9 @@ private static void cleanUp() throws Exception {
 
       notificationOpenedMessage = null;
       lastGetTags = null;
-      lastExternalUserIdResponse = null;;
+      lastExternalUserIdResponse = null;
+      lastEmailUpdateFailure = null;
+      didEmailUpdateSucceed = false;
 
       ShadowGMSLocationController.reset();
       TestHelpers.beforeTestInitAndCleanup();
@@ -4202,7 +4220,7 @@ public void shouldAlwaysSetExternalIdWithAuthHashAAfterRegistration() throws Exc
    }
 
    @Test
-   public void shouldAlwaysSetExternalIdAndEmailWithAuthHashAAfterRegistration() throws Exception {
+   public void shouldAlwaysSetExternalIdAndEmailWithAuthHashAfterRegistration() throws Exception {
       OneSignalInit();
       threadAndTaskWait();
 
@@ -4260,6 +4278,102 @@ public void shouldRemoveExternalUserId() throws Exception {
       assertEquals(removeIdRequest.payload.getString("external_user_id"), "");
    }
 
+   @Test
+   public void shouldRemoveExternalUserIdFromPushWithAuthHash() throws Exception {
+      String testExternalId = "test_ext_id";
+      String mockExternalIdHash = new String(new char[64]).replace('\0', '0');
+
+      OneSignal.setExternalUserId(testExternalId, mockExternalIdHash, null);
+      OneSignalInit();
+      threadAndTaskWait();
+
+      OneSignal.removeExternalUserId(getExternalUserIdUpdateCompletionHandler());
+      threadAndTaskWait();
+
+      JSONObject expectedExternalUserIdResponse = new JSONObject(
+              "{" +
+                      "   \"push\" : {" +
+                      "      \"success\" : true" +
+                      "   }" +
+                      "}"
+      );
+      assertEquals(expectedExternalUserIdResponse.toString(), lastExternalUserIdResponse.toString());
+
+      assertEquals(3, ShadowOneSignalRestClient.networkCallCount);
+
+      ShadowOneSignalRestClient.Request removeIdRequest = ShadowOneSignalRestClient.requests.get(2);
+      assertEquals(ShadowOneSignalRestClient.REST_METHOD.PUT, removeIdRequest.method);
+      assertEquals(removeIdRequest.payload.getString("external_user_id"), "");
+      assertEquals(mockExternalIdHash, removeIdRequest.payload.getString("external_user_id_auth_hash"));
+   }
+
+   @Test
+   public void shouldRemoveExternalUserIdFromEmailWithAuthHash() throws Exception {
+      String testEmail = "[email protected]";
+      String mockEmailHash = new String(new char[64]).replace('\0', '0');
+
+      OneSignal.setEmail(testEmail, mockEmailHash, getEmailUpdateHandler());
+      OneSignalInit();
+      threadAndTaskWait();
+
+      OneSignal.removeExternalUserId(getExternalUserIdUpdateCompletionHandler());
+      threadAndTaskWait();
+
+      JSONObject expectedExternalUserIdResponse = new JSONObject(
+              "{" +
+                      "   \"push\" : {" +
+                      "      \"success\" : true" +
+                      "   }" + ", " +
+                      "   \"email\" : {" +
+                      "      \"success\" : true" +
+                      "   }" +
+                      "}"
+      );
+      assertEquals(expectedExternalUserIdResponse.toString(), lastExternalUserIdResponse.toString());
+      assertTrue(didEmailUpdateSucceed);
+      assertNull(lastEmailUpdateFailure);
+
+      assertEquals(6, ShadowOneSignalRestClient.networkCallCount);
+
+      ShadowOneSignalRestClient.Request removeIdRequest = ShadowOneSignalRestClient.requests.get(4);
+      assertEquals(ShadowOneSignalRestClient.REST_METHOD.PUT, removeIdRequest.method);
+      assertEquals(removeIdRequest.payload.getString("external_user_id"), "");
+      assertFalse(removeIdRequest.payload.has("external_user_id_auth_hash"));
+
+      ShadowOneSignalRestClient.Request removeIdEmailRequest = ShadowOneSignalRestClient.requests.get(5);
+      assertEquals(ShadowOneSignalRestClient.REST_METHOD.PUT, removeIdEmailRequest.method);
+      assertEquals(removeIdEmailRequest.payload.getString("external_user_id"), "");
+      assertEquals(mockEmailHash, removeIdEmailRequest.payload.getString("email_auth_hash"));
+   }
+
+   @Test
+   public void shouldRemoveExternalUserIdFromPushAndEmailWithAuthHash() throws Exception {
+      String testExternalId = "test_ext_id";
+      String mockExternalIdHash = new String(new char[64]).replace('\0', '0');
+      String testEmail = "[email protected]";
+      String mockEmailHash = new String(new char[64]).replace('\0', '0');
+
+      OneSignal.setExternalUserId(testExternalId, mockExternalIdHash, null);
+      OneSignal.setEmail(testEmail, mockEmailHash, null);
+      OneSignalInit();
+      threadAndTaskWait();
+
+      OneSignal.removeExternalUserId();
+      threadAndTaskWait();
+
+      assertEquals(6, ShadowOneSignalRestClient.networkCallCount);
+
+      ShadowOneSignalRestClient.Request removeIdRequest = ShadowOneSignalRestClient.requests.get(4);
+      assertEquals(ShadowOneSignalRestClient.REST_METHOD.PUT, removeIdRequest.method);
+      assertEquals(removeIdRequest.payload.getString("external_user_id"), "");
+      assertEquals(mockExternalIdHash, removeIdRequest.payload.getString("external_user_id_auth_hash"));
+
+      ShadowOneSignalRestClient.Request removeIdEmailRequest = ShadowOneSignalRestClient.requests.get(5);
+      assertEquals(ShadowOneSignalRestClient.REST_METHOD.PUT, removeIdEmailRequest.method);
+      assertEquals(removeIdEmailRequest.payload.getString("external_user_id"), "");
+      assertEquals(mockEmailHash, removeIdEmailRequest.payload.getString("email_auth_hash"));
+   }
+
    @Test
    public void doesNotSendSameExternalId() throws Exception {
       String testExternalId = "test_ext_id";