Fix bug where actual and expected were reversed

hertzsprung · hertzsprung · commit ac82aeef09e3 · 2012-08-25T01:29:34.000+01:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -1,12 +1,19 @@
 package org.skyscreamer.jsonassert;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.*;
-
 /**
  * Provides the logic to compare two JSON entities.  This is the backend to {@link JSONAssert}, but it can
  * be programmed against directly to access the functionality.  (eg, to make something that works with a
@@ -201,14 +208,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
@@ -1,11 +1,12 @@
 package org.skyscreamer.jsonassert;
 
+import static org.skyscreamer.jsonassert.JSONCompareMode.LENIENT;
+import static org.skyscreamer.jsonassert.JSONCompareMode.STRICT;
+
 import org.json.JSONException;
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.skyscreamer.jsonassert.JSONCompareMode.*;
-
 /**
  * Unit tests for {@link JSONAssert}
  */
@@ -135,7 +136,12 @@ 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 testLenientArrayRecursion() throws JSONException {
+        testPass("[{\"arr\":[5, 2, 1]}]", "[{\"b\":3, \"arr\":[1, 5, 2]}]", false);
+    }
+    
     private void testPass(String expected, String actual, boolean strict)
         throws JSONException
     {
