Improve diagnostics of occurrences of values in JSONArrays

hertzsprung · hertzsprung · commit 4708f8a04717 · 2012-09-16T19:02:38.000+01:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -169,8 +169,8 @@ else if (allSimpleValues(expected)) {
                     result.fail(key + "[]: Expected " + o + ", but not found");
                 }
                 else if (actualCount.get(o) != expectedCount.get(o)) {
-                    result.fail(key + "[]: Expected contains " + expectedCount.get(o) + " " + o
-                            + " actual contains " + actualCount.get(o));
+                    result.fail(key + "[]: Expected " + expectedCount.get(o) + " occurrence(s) of " + o
+                            + " but got " + actualCount.get(o) + " occurrence(s)");
                 }
             }
             for(Object o : actualCount.keySet()) {
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java
@@ -19,7 +19,7 @@ public class JSONCompareTest {
     @Test
     public void reportsWrongSimpleValueCountInUnorderedArray() throws JSONException {
         JSONCompareResult result = compareJSON("[5, 5]", "[5, 7]", LENIENT);
-        assertThat(result, failsWithMessage(equalTo("[]: Expected contains 2 5 actual contains 1 ; []: Contains 7, but not expected")));
+        assertThat(result, failsWithMessage(equalTo("[]: Expected 2 occurrence(s) of 5 but got 1 occurrence(s) ; []: Contains 7, but not expected")));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ else if (allSimpleValues(expected)) {`
`169`	`169`	`result.fail(key + "[]: Expected " + o + ", but not found");`
`170`	`170`	`}`
`171`	`171`	`else if (actualCount.get(o) != expectedCount.get(o)) {`
`172`		`- result.fail(key + "[]: Expected contains " + expectedCount.get(o) + " " + o`
`173`		`- + " actual contains " + actualCount.get(o));`
	`172`	`+ result.fail(key + "[]: Expected " + expectedCount.get(o) + " occurrence(s) of " + o`
	`173`	`+ + " but got " + actualCount.get(o) + " occurrence(s)");`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`for(Object o : actualCount.keySet()) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class JSONCompareTest {`
`19`	`19`	`@Test`
`20`	`20`	`public void reportsWrongSimpleValueCountInUnorderedArray() throws JSONException {`
`21`	`21`	`JSONCompareResult result = compareJSON("[5, 5]", "[5, 7]", LENIENT);`
`22`		`- assertThat(result, failsWithMessage(equalTo("[]: Expected contains 2 5 actual contains 1 ; []: Contains 7, but not expected")));`
	`22`	`+ assertThat(result, failsWithMessage(equalTo("[]: Expected 2 occurrence(s) of 5 but got 1 occurrence(s) ; []: Contains 7, but not expected")));`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Test`