Merge remote-tracking branch 'upstream/master' into enum-enhance

hertzsprung · hertzsprung · commit 02b074b8bf88 · 2012-08-25T22:35:36.000+01:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -112,6 +112,31 @@ else if (expectedValue instanceof JSONObject) {
             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();
         }
     }
 
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
@@ -6,6 +6,9 @@
 public class JSONCompareResult {
     private boolean _success;
     private String _message;
+    private String _field;
+    private Object _expected;
+    private Object _actual;
 
     /**
      * Default constructor.
@@ -42,6 +45,45 @@ public boolean failed() {
     public String getMessage() {
         return _message;
     }
+
+    /**
+     * Actual field value
+     * 
+     * @return a {@code JSONObject}, {@code JSONArray} or other {@code Object}
+     *         instance, or {@code null} if the comparison did not fail on a
+     *         particular field
+     */
+    public Object getActual() {
+        return _actual;
+    }
+    
+    /**
+     * Expected field value
+     * 
+     * @return a {@code JSONObject}, {@code JSONArray} or other {@code Object}
+     *         instance, or {@code null} if the comparison did not fail on a
+     *         particular field
+     */
+    public Object getExpected() {
+        return _expected;
+    }
+    
+    /**
+     * Check if comparison failed on a particular field
+     */
+    public boolean isFailureOnField() {
+        return _field != null;
+    }
+
+    /**
+     * Dot-separated path the the field that failed comparison
+     * 
+     * @return a {@code String} instance, or {@code null} if the comparison did
+     *         not fail on a particular field
+     */
+    public String getField() {
+        return _field;
+    }
     
     protected void fail(String message) {
         _success = false;
@@ -54,13 +96,20 @@ protected void fail(String message) {
     }
 
     protected void fail(String field, Object expected, Object actual) {
+        this._field = field;
+        this._expected = expected;
+        this._actual = actual;
+        fail(formatFailureMessage(field, expected, actual));
+    }
+
+    private String formatFailureMessage(String field, Object expected, Object actual) {
         StringBuffer message= new StringBuffer();
         message.append(field);
         message.append("\nExpected: ");
         message.append(expected + "");
         message.append("\n     got: ");
         message.append(actual + "");
         message.append("\n");
-        fail(message.toString());
+        return message.toString();
     }
 }
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java
@@ -135,6 +135,31 @@ public void testArrayOfArraysStrict() throws JSONException {
     public void testArrayOfArrays() throws JSONException {
         testPass("{id:1,stuff:[[4,3],[3,2],[],[1,2]]}", "{id:1,stuff:[[1,2],[2,3],[],[3,4]]}", false);
     }
+    
+    @Test
+    public void testFieldMismatch() throws JSONException {
+        JSONCompareResult result = JSONCompare.compareJSON("{name:\"Pat\"}", "{name:\"Sue\"}", STRICT);
+        Assert.assertEquals("Pat", result.getExpected());
+        Assert.assertEquals("Sue", result.getActual());
+        Assert.assertEquals("name", result.getField());
+    }
+
+    @Test
+    public void testNullProperty() throws JSONException {
+        testFail("{id:1,name:\"Joe\"}", "{id:1,name:null}", true);
+        testFail("{id:1,name:null}", "{id:1,name:\"Joe\"}", true);
+    }
+
+    @Test
+    public void testIncorrectTypes() throws JSONException {
+        testFail("{id:1,name:\"Joe\"}", "{id:1,name:[]}", true);
+        testFail("{id:1,name:[]}", "{id:1,name:\"Joe\"}", true);
+    }
+
+    @Test
+    public void testNullEquality() throws JSONException {
+        testPass("{id:1,name:null}", "{id:1,name:null}", true);
+    }
 
     private void testPass(String expected, String actual, boolean strict)
         throws JSONException
