Merge pull request skyscreamer#8 from hertzsprung/lenient-recurse-bug

carterpage · carterpage · commit 541de4355a1b · 2012-08-25T14:34:07.000-07:00
Bug in recursive comparison
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -226,14 +226,14 @@ private static void recursivelyCompareJSONArray(String key, JSONArray expected,
                     continue;
                 }
                 if (actualElement instanceof JSONObject) {
-                    if (compareJSON((JSONObject)actualElement, (JSONObject)expected.get(j), mode).passed()) {
+                    if (compareJSON((JSONObject)expected.get(j), (JSONObject)actualElement, mode).passed()) {
                         matched.add(j);
                         matchFound = true;
                         break;
                     }
                 }
                 else if (actualElement instanceof JSONArray) {
-                    if (compareJSON((JSONArray)actualElement, (JSONArray)expected.get(j), mode).passed()) {
+                    if (compareJSON((JSONArray)expected.get(j), (JSONArray)actualElement, mode).passed()) {
                         matched.add(j);
                         matchFound = true;
                         break;
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java
@@ -137,6 +137,11 @@ public void testArrayOfArrays() throws JSONException {
     }
     
     @Test
+    public void testLenientArrayRecursion() throws JSONException {
+        testPass("[{\"arr\":[5, 2, 1]}]", "[{\"b\":3, \"arr\":[1, 5, 2]}]", false);
+    }
+   
+    @Test 
     public void testFieldMismatch() throws JSONException {
         JSONCompareResult result = JSONCompare.compareJSON("{name:\"Pat\"}", "{name:\"Sue\"}", STRICT);
         Assert.assertEquals("Pat", result.getExpected());

Original file line number	Diff line number	Diff line change
`@@ -226,14 +226,14 @@ private static void recursivelyCompareJSONArray(String key, JSONArray expected,`
`226`	`226`	`continue;`
`227`	`227`	`}`
`228`	`228`	`if (actualElement instanceof JSONObject) {`
`229`		`- if (compareJSON((JSONObject)actualElement, (JSONObject)expected.get(j), mode).passed()) {`
	`229`	`+ if (compareJSON((JSONObject)expected.get(j), (JSONObject)actualElement, mode).passed()) {`
`230`	`230`	`matched.add(j);`
`231`	`231`	`matchFound = true;`
`232`	`232`	`break;`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`	`else if (actualElement instanceof JSONArray) {`
`236`		`- if (compareJSON((JSONArray)actualElement, (JSONArray)expected.get(j), mode).passed()) {`
	`236`	`+ if (compareJSON((JSONArray)expected.get(j), (JSONArray)actualElement, mode).passed()) {`
`237`	`237`	`matched.add(j);`
`238`	`238`	`matchFound = true;`
`239`	`239`	`break;`