Unify more diagnostics and get JSONCompareResult to do more of the pretty printing

hertzsprung · hertzsprung · commit e75339bd6507 · 2012-09-22T22:26:30.000+01:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -35,10 +35,10 @@ else if ((expected instanceof JSONArray) && (actual instanceof JSONArray)) {
             return compareJSON((JSONArray)expected, (JSONArray)actual, mode);
         }
         else if (expected instanceof JSONObject) {
-            return new JSONCompareResult().fail("", "a JSON object", "a JSON array");
+            return new JSONCompareResult().fail("", expected, actual);
         }
         else {
-            return new JSONCompareResult().fail("", "a JSON array", "a JSON object");
+            return new JSONCompareResult().fail("", expected, actual);
         }
     }
 
@@ -115,30 +115,7 @@ else if (!expectedValue.equals(actualValue)) {
                 result.fail(fullKey, expectedValue, actualValue);
             }
         } else {
-            if (isNull(expectedValue)) {
-                result.fail(fullKey + ": expected null, but got " + classToType(actualValue));
-            } else if (isNull(actualValue)) {
-                result.fail(fullKey + ": expected " + classToType(expectedValue) + ", but got null");
-            } else {
-                result.fail("Values of " + fullKey + " have different types: expected " + classToType(expectedValue)
-                        + ", but got " + classToType(actualValue));
-            }
-        }
-    }
-
-    private static boolean isNull(Object value) {
-        return value.getClass().getSimpleName().equals("Null");
-    }
-
-    private static String classToType(Object value) {
-        if (value instanceof JSONArray) {
-            return "an array";
-        } else if (value instanceof JSONObject) {
-            return "an object";
-        } else if (value instanceof String) {
-            return "a string";
-        } else {
-            return value.getClass().getName();
+            result.fail(fullKey, expectedValue, actualValue);
         }
     }
 
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
@@ -4,6 +4,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 /**
  * Bean for holding results from JSONCompare.
  */
@@ -129,13 +132,23 @@ private String formatFailureMessage(String field, Object expected, Object actual
         StringBuffer message= new StringBuffer();
         message.append(field);
         message.append("\nExpected: ");
-        message.append(expected + "");
+        message.append(describe(expected));
         message.append("\n     got: ");
-        message.append(actual + "");
+        message.append(describe(actual));
         message.append("\n");
         return message.toString();
     }
 
+    private static String describe(Object value) {
+        if (value instanceof JSONArray) {
+            return "a JSON array";
+        } else if (value instanceof JSONObject) {
+            return "a JSON object";
+        } else {
+            return value.toString();
+        }
+    }
+
     @Override
     public String toString() {
         return _message;
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java
@@ -55,13 +55,13 @@ public void reportsUnexpectedObjectWhenExpectingArray() throws JSONException {
     @Test
     public void reportsUnexpectedNull() throws JSONException {
         JSONCompareResult result = compareJSON("{\"id\": 3}", "{\"id\": null}", LENIENT);
-        assertThat(result, failsWithMessage(equalTo("id: expected java.lang.Integer, but got null")));
+        assertThat(result, failsWithMessage(equalTo("id\nExpected: 3\n     got: null\n")));
     }
 
     @Test
     public void reportsUnexpectedNonNull() throws JSONException {
         JSONCompareResult result = compareJSON("{\"id\": null}", "{\"id\": \"abc\"}", LENIENT);
-        assertThat(result, failsWithMessage(equalTo("id: expected null, but got a string")));
+        assertThat(result, failsWithMessage(equalTo("id\nExpected: null\n     got: abc\n")));
     }
 
     @Test
@@ -73,7 +73,7 @@ public void reportsUnexpectedFieldInNonExtensibleMode() throws JSONException {
     @Test
     public void reportsMismatchedTypes() throws JSONException {
         JSONCompareResult result = compareJSON("{\"arr\":[]}", "{\"arr\":{}}", LENIENT);
-        assertThat(result, failsWithMessage(equalTo("Values of arr have different types: expected an array, but got an object")));
+        assertThat(result, failsWithMessage(equalTo("arr\nExpected: a JSON array\n     got: a JSON object\n")));
     }
 
     @Test
