Update JsonCreateRequestBodyTest so that the order of keys is ignored

Author: Robert Ramsay

src/test/java/com/telesign/JsonCreateRequestBodyTest.java

@@ -1,36 +1,46 @@
 package com.telesign;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
 import junit.framework.TestCase;
 import okhttp3.RequestBody;
 import okio.Buffer;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 
 public class JsonCreateRequestBodyTest extends TestCase {
 
-    private void makeRequestBodyAndAssert(HashMap<String, ? extends Object> params, String expectedJson) {
+    private void makeRequestBodyAndAssert(HashMap<String, ? extends Object> params) {
         PhoneIdClient phoneIdClient = new PhoneIdClient("", "");
         Buffer actualJsonBuffer = new Buffer();
+        Gson gson = new Gson();
+
         try {
             RequestBody rb = phoneIdClient.createRequestBody(params, RestClient.JSON_CONTENT_TYPE);
             rb.writeTo(actualJsonBuffer);
         } catch (IOException exc) {
             fail(exc.getMessage());
         }
-        assertEquals(expectedJson, actualJsonBuffer.readUtf8());
+        HashMap<String, Object> unserializedJson = gson.fromJson(actualJsonBuffer.readUtf8(),
+                new TypeToken<HashMap<String, Object>>() {}.getType());
+        assertEquals(params, unserializedJson);
     }
 
     public void testEmptyParams() {
-        makeRequestBodyAndAssert(new HashMap<String, Object>(), "{}");
+        makeRequestBodyAndAssert(new HashMap<String, Object>());
     }
 
     public void testNoAddonsParams() {
         HashMap<String, String> params = new HashMap<String, String>() {{
             put("originating_ip", "127.0.0.1");
             put("bogus", "param");
         }};
-        makeRequestBodyAndAssert(params, "{\"bogus\":\"param\",\"originating_ip\":\"127.0.0.1\"}");
+        makeRequestBodyAndAssert(params);
     }
 
     public void testAddonParamOnly() {
@@ -56,7 +66,7 @@ public void testAddonParamOnly() {
                 put("subscriber_status", new HashMap<>());
             }});
         }};
-        makeRequestBodyAndAssert(params, "{\"addons\":{\"contact_plus\":{\"billing_postal_code\":\"90210\"},\"device_info\":{},\"current_location_plus\":{},\"contact\":{},\"number_deactivation\":{},\"subscriber_status\":{},\"contact_match\":{\"country\":\"USA\",\"address\":\"12345 Some St\",\"city\":\"Los Angeles\",\"last_name\":\"Smith\",\"state\":\"CA\",\"postal_code\":\"90210\",\"first_name\":\"Bob\"},\"current_location\":{}}}");
+        makeRequestBodyAndAssert(params);
     }
     public void testAddonAndRegularParams() {
         HashMap<String, Object> params = new HashMap<String, Object>() {{
@@ -83,6 +93,6 @@ public void testAddonAndRegularParams() {
                 put("subscriber_status", new HashMap<>());
             }});
         }};
-        makeRequestBodyAndAssert(params, "{\"addons\":{\"contact_plus\":{\"billing_postal_code\":\"90210\"},\"device_info\":{},\"current_location_plus\":{},\"contact\":{},\"number_deactivation\":{},\"subscriber_status\":{},\"contact_match\":{\"country\":\"USA\",\"address\":\"12345 Some St\",\"city\":\"Los Angeles\",\"last_name\":\"Smith\",\"state\":\"CA\",\"postal_code\":\"90210\",\"first_name\":\"Bob\"},\"current_location\":{}},\"originating_ip\":\"127.0.0.1\",\"account_lifecycle_event\":\"create\"}");
+        makeRequestBodyAndAssert(params);
     }
 }