Don't create IAMs in unit tests from other IAMs (use JSON only)

- some unit tests will create an IAM based off JSON of another IAM by calling toJSONObject()
- toJSONObject uses key of "messageId" so we need to replace that with "id" for creating an IAM

- added convertIAMtoJSONObject() that replaces "messageId" with "id"
- refactored code to use this method instead of toJSONObject()
- removed OSTestInAppMessageInternal constructor that took argument of OSInAppMessageInternal in favor of passing in JSON only

Author: nan-li

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

@@ -19,6 +19,20 @@ public class InAppMessagingHelpers {
     public static final String IAM_PAGE_ID = "12345678-1234-ABCD-1234-123456789012";
     public static final String IAM_HAS_LIQUID = "has_liquid";
 
+    // unit tests will create an IAM based off JSON of another IAM
+    // toJSONObject uses key of "messageId" so we need to replace that with "id" for creating IAM
+    public static JSONObject convertIAMtoJSONObject(OSInAppMessageInternal inAppMessage) {
+        JSONObject json = inAppMessage.toJSONObject();
+        try {
+            json.put("id", json.get("messageId"));
+            json.remove("messageId");
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return json;
+    }
+
     public static boolean evaluateMessage(OSInAppMessageInternal message) {
         return OneSignal.getInAppMessageController().triggerController.evaluateMessageTriggers(message);
     }

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

@@ -358,10 +358,6 @@ public OSTestInAppMessageInternal(@NonNull String messageId, int displaysQuantit
          super(json);
       }
 
-      OSTestInAppMessageInternal(OSInAppMessageInternal inAppMessage) throws JSONException {
-         super(inAppMessage.toJSONObject());
-      }
-
       public void setMessageId(String messageId) {
          this.messageId = messageId;
       }
@@ -586,7 +582,8 @@ public static List<OSTestInAppMessageInternal> getRedisplayInAppMessages() {
 
       for (OSInAppMessageInternal message : messages) {
          try {
-            OSTestInAppMessageInternal testInAppMessage = new OSTestInAppMessageInternal(message);
+            JSONObject json = InAppMessagingHelpers.convertIAMtoJSONObject(message);
+            OSTestInAppMessageInternal testInAppMessage = new OSTestInAppMessageInternal(json);
             testInAppMessage.getRedisplayStats().setDisplayStats(message.getRedisplayStats());
             testMessages.add(testInAppMessage);
 

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

@@ -1911,7 +1911,7 @@ private void setMockRegistrationResponseWithMessages(ArrayList<OSTestInAppMessag
         final JSONArray jsonMessages = new JSONArray();
 
         for (OSTestInAppMessageInternal message : messages)
-            jsonMessages.put(message.toJSONObject());
+            jsonMessages.put(InAppMessagingHelpers.convertIAMtoJSONObject(message));
 
         ShadowOneSignalRestClient.setNextSuccessfulRegistrationResponse(new JSONObject() {{
             put("id", "df8f05be55ba-b2f7f966-d8cc-11e4-bed1");