Only remove unquoted whitespace from JSON strings for comparison

bugsnag-android-core/src/test/java/com/bugsnag/android/JsonUtils.kt

@@ -19,11 +19,53 @@ internal fun verifyJsonMatches(map: Map<String, Any>, resourceName: String) {
     validateJson(resourceName, json)
 }
 
+/**
+ * To help comparing JSON we remove any whitespace that hasn't been quoted. So:
+ * ```
+ * {
+ *      "some key": "Some Value"
+ * }
+ * ```
+ *
+ * Becomes:
+ * ```
+ * {"some key":"Some Value"}
+ * ```
+ */
+private fun removeUnquotedWhitespace(json: String): String {
+    val builder = StringBuilder(json.length)
+    var quoted = false
+    var index = 0
+
+    while (index < json.length) {
+        val ch = json[index++]
+
+        if (quoted) {
+            when (ch) {
+                '\"' -> quoted = false
+                '\\' -> {
+                    builder.append('\\')
+                    builder.append(json[index++])
+                }
+            }
+
+            builder.append(ch)
+        } else if (!ch.isWhitespace()) {
+            builder.append(ch)
+
+            if (ch == '\"') {
+                quoted = true
+            }
+        }
+    }
+
+    return builder.toString()
+}
+
 internal fun validateJson(resourceName: String, json: String) {
-    val whitespace = "\\s".toRegex()
     val rawJson = JsonParser().read(resourceName)
-    val expectedJson = rawJson.replace(whitespace, "")
-    val generatedJson = json.replace(whitespace, "")
+    val expectedJson = removeUnquotedWhitespace(rawJson)
+    val generatedJson = removeUnquotedWhitespace(json)
     Assert.assertEquals(expectedJson, generatedJson)
 }
 

bugsnag-android-core/src/test/resources/app_data_serialization_0.json

@@ -3,7 +3,7 @@
   "codeBundleId": "foo-99",
   "id": "com.example.foo",
   "releaseStage": "test-stage",
-  "type": "ReactNative",
+  "type": "React Native",
   "version": "1.2.3",
   "versionCode": 55
 }

bugsnag-android-core/src/test/resources/app_data_serialization_1.json

@@ -3,7 +3,7 @@
   "codeBundleId": "foo-99",
   "id": "com.example.foo",
   "releaseStage": "test-stage",
-  "type": "ReactNative",
+  "type": "React Native",
   "version": "1.2.3",
   "versionCode": 55,
   "duration": 0,

bugsnag-android-core/src/test/resources/breadcrumb_serialization_0.json

@@ -1,6 +1,6 @@
 {
   "timestamp": "1970-01-01T00:00:00.000Z",
-  "name": "helloworld",
+  "name": "hello world",
   "type": "manual",
   "metaData": {}
 }

bugsnag-android-core/src/test/resources/breadcrumb_state_serialization_0.json

@@ -1,7 +1,7 @@
 [
   {
     "timestamp": "1970-01-01T00:00:00.000Z",
-    "name": "helloworld",
+    "name": "hello world",
     "type": "manual",
     "metaData": {
       "direction": "left"

bugsnag-android-core/src/test/resources/event_serialization_6.json

@@ -4,7 +4,7 @@
       "foo": 55
     },
     "wham": {
-      "some_key": "Avalue"
+      "some_key": "A value"
     },
     "device": {
       "bar": true
@@ -53,7 +53,7 @@
   "breadcrumbs": [
     {
       "timestamp": "1970-01-01T00:00:00.000Z",
-      "name": "helloworld",
+      "name": "hello world",
       "type": "manual",
       "metaData": {}
     }