skyscreamer#12 provide diagnostics when comparing JSONObject with JSONArray

hertzsprung · hertzsprung · commit 70aee766ed72 · 2012-09-12T16:47:04.000+01:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -33,10 +33,10 @@ else if ((expected instanceof JSONArray) && (actual instanceof JSONArray)) {
             return compareJSON((JSONArray)expected, (JSONArray)actual, mode);
         }
         else if (expected instanceof JSONObject) {
-            throw new IllegalArgumentException("Expected a JSON object, but passed in a JSON array.");
+            return new JSONCompareResult().fail("", "a JSON object", "a JSON array");
         }
         else {
-            throw new IllegalArgumentException("Expected a JSON array, but passed in a JSON object.");
+            return new JSONCompareResult().fail("", "a JSON array", "a JSON object");
         }
     }
 
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
@@ -95,11 +95,12 @@ protected void fail(String message) {
         }
     }
 
-    protected void fail(String field, Object expected, Object actual) {
+    protected JSONCompareResult fail(String field, Object expected, Object actual) {
         this._field = field;
         this._expected = expected;
         this._actual = actual;
         fail(formatFailureMessage(field, expected, actual));
+        return this;
     }
 
     private String formatFailureMessage(String field, Object expected, Object actual) {
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java
@@ -166,6 +166,16 @@ public void testNullEquality() throws JSONException {
         testPass("{id:1,name:null}", "{id:1,name:null}", true);
     }
 
+    @Test
+    public void testExpectedArrayButActualObject() throws JSONException {
+        testFail("[1]", "{id:1}", false);
+    }
+
+    @Test
+    public void testExpectedObjectButActualArray() throws JSONException {
+        testFail("{id:1}", "[1]", false);
+    }
+
     private void testPass(String expected, String actual, boolean strict)
         throws JSONException
     {

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ else if ((expected instanceof JSONArray) && (actual instanceof JSONArray)) {`
`33`	`33`	`return compareJSON((JSONArray)expected, (JSONArray)actual, mode);`
`34`	`34`	`}`
`35`	`35`	`else if (expected instanceof JSONObject) {`
`36`		`- throw new IllegalArgumentException("Expected a JSON object, but passed in a JSON array.");`
	`36`	`+ return new JSONCompareResult().fail("", "a JSON object", "a JSON array");`
`37`	`37`	`}`
`38`	`38`	`else {`
`39`		`- throw new IllegalArgumentException("Expected a JSON array, but passed in a JSON object.");`
	`39`	`+ return new JSONCompareResult().fail("", "a JSON array", "a JSON object");`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,12 @@ protected void fail(String message) {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- protected void fail(String field, Object expected, Object actual) {`
	`98`	`+ protected JSONCompareResult fail(String field, Object expected, Object actual) {`
`99`	`99`	`this._field = field;`
`100`	`100`	`this._expected = expected;`
`101`	`101`	`this._actual = actual;`
`102`	`102`	`fail(formatFailureMessage(field, expected, actual));`
	`103`	`+ return this;`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`private String formatFailureMessage(String field, Object expected, Object actual) {`