Merge pull request skyscreamer#18 from carterpage/array_of_boolean

carterpage · carterpage · commit b1157603f1f3 · 2012-10-15T14:10:31.000-07:00
Fixed JSONCompare handling for arrays of boolean
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -148,7 +148,7 @@ else if (allSimpleValues(expected)) {
                 if (!actualCount.containsKey(o)) {
                     result.missing(key + "[]", o);
                 }
-                else if (actualCount.get(o) != expectedCount.get(o)) {
+                else if (!actualCount.get(o).equals(expectedCount.get(o))) {
                     result.fail(key + "[]: Expected " + expectedCount.get(o) + " occurrence(s) of " + o
                             + " but got " + actualCount.get(o) + " occurrence(s)");
                 }
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java
@@ -155,6 +155,13 @@ public void testFieldMismatch() throws JSONException {
         Assert.assertEquals("name", comparisonFailure.getField());
     }
 
+    @Test
+    public void testBooleanArray() throws JSONException {
+        testPass("[true, false, true, true, false]", "[true, false, true, true, false]", true);
+        testPass("[false, true, true, false, true]", "[true, false, true, true, false]", false);
+        testFail("[false, true, true, false, true]", "[true, false, true, true, false]", true);
+    }
+
     @Test
     public void testNullProperty() throws JSONException {
         testFail("{id:1,name:\"Joe\"}", "{id:1,name:null}", true);

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ else if (allSimpleValues(expected)) {`
`148`	`148`	`if (!actualCount.containsKey(o)) {`
`149`	`149`	`result.missing(key + "[]", o);`
`150`	`150`	`}`
`151`		`- else if (actualCount.get(o) != expectedCount.get(o)) {`
	`151`	`+ else if (!actualCount.get(o).equals(expectedCount.get(o))) {`
`152`	`152`	`result.fail(key + "[]: Expected " + expectedCount.get(o) + " occurrence(s) of " + o`
`153`	`153`	`+ " but got " + actualCount.get(o) + " occurrence(s)");`
`154`	`154`	`}`