Merge pull request skyscreamer#38 from acourtneybrown/master

carterpage · carterpage · commit 1a56eddd72af · 2013-12-31T06:53:30.000-08:00
Added support for comparing strings and numbers as represented in JSON strings
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -3,6 +3,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONString;
 import org.skyscreamer.jsonassert.comparator.DefaultComparator;
 import org.skyscreamer.jsonassert.comparator.JSONComparator;
 
@@ -39,6 +40,9 @@ public static JSONCompareResult compareJSON(String expectedStr, String actualStr
         else if ((expected instanceof JSONArray) && (actual instanceof JSONArray)) {
             return compareJSON((JSONArray)expected, (JSONArray)actual, comparator);
         }
+        else if (expected instanceof JSONString && actual instanceof JSONString) {
+            return compareJson((JSONString) expected, (JSONString) actual);
+        }
         else if (expected instanceof JSONObject) {
             return new JSONCompareResult().fail("", expected, actual);
         }
@@ -47,7 +51,7 @@ else if (expected instanceof JSONObject) {
         }
     }
 
-    /**
+  /**
      * Compares JSON object provided to the expected JSON object using provided comparator, and returns the results of
      * the comparison.
      * @param expected expected json object
@@ -75,6 +79,23 @@ public static JSONCompareResult compareJSON(JSONArray expected, JSONArray actual
         return comparator.compareJSON(expected, actual);
     }
 
+    /**
+     * Compares {@link JSONString} provided to the expected {@code JSONString}, checking that the
+     * {@link org.json.JSONString#toJSONString()} are equal.
+     *
+     * @param expected Expected {@code JSONstring}
+     * @param actual   {@code JSONstring} to compare
+     */
+    public static JSONCompareResult compareJson(final JSONString expected, final JSONString actual) {
+        final JSONCompareResult result = new JSONCompareResult();
+        final String expectedJson = expected.toJSONString();
+        final String actualJson = actual.toJSONString();
+        if (!expectedJson.equals(actualJson)) {
+          result.fail("");
+        }
+        return result;
+    }
+
     /**
      * Compares JSON string provided to the expected JSON string, and returns the results of the comparison.
      *
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONParser.java b/src/main/java/org/skyscreamer/jsonassert/JSONParser.java
@@ -3,11 +3,17 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONString;
 
 /**
  * Simple JSON parsing utility.
  */
 public class JSONParser {
+    // regular expression to match a number in JSON format.  see http://www.json.org/fatfree.html.
+    // "A number can be represented as integer, real, or floating point. JSON does not support octal or hex
+    // ... [or] NaN or Infinity".
+    private static final String NUMBER_REGEX = "-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?";
+
     private JSONParser() {}
 
     /**
@@ -18,12 +24,20 @@ private JSONParser() {}
      * @return JSONObject or JSONArray
      * @throws JSONException
      */
-    public static Object parseJSON(String s) throws JSONException {
+    public static Object parseJSON(final String s) throws JSONException {
         if (s.trim().startsWith("{")) {
             return new JSONObject(s);
         }
         else if (s.trim().startsWith("[")) {
             return new JSONArray(s);
+        } else if (s.trim().startsWith("\"")
+                   || s.trim().matches(NUMBER_REGEX)) {
+          return new JSONString() {
+            @Override
+            public String toJSONString() {
+              return s;
+            }
+          };
         }
         throw new JSONException("Unparsable JSON string: " + s);
     }
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONAssertTest.java
@@ -14,6 +14,36 @@
  * Unit tests for {@link JSONAssert}
  */
 public class JSONAssertTest {
+    @Test
+    public void testString() throws JSONException {
+        testPass("\"Joe\"", "\"Joe\"", STRICT);
+        testPass("\"Joe\"", "\"Joe\"", LENIENT);
+        testPass("\"Joe\"", "\"Joe\"", NON_EXTENSIBLE);
+        testPass("\"Joe\"", "\"Joe\"", STRICT_ORDER);
+        testFail("\"Joe\"", "\"Joe1\"", STRICT);
+        testFail("\"Joe\"", "\"Joe2\"", LENIENT);
+        testFail("\"Joe\"", "\"Joe3\"", NON_EXTENSIBLE);
+        testFail("\"Joe\"", "\"Joe4\"", STRICT_ORDER);
+    }
+
+    @Test
+    public void testNumber() throws JSONException {
+        testPass("123", "123", STRICT);
+        testPass("123", "123", LENIENT);
+        testPass("123", "123", NON_EXTENSIBLE);
+        testPass("123", "123", STRICT_ORDER);
+        testFail("123", "1231", STRICT);
+        testFail("123", "1232", LENIENT);
+        testFail("123", "1233", NON_EXTENSIBLE);
+        testFail("123", "1234", STRICT_ORDER);
+        testPass("0", "0", STRICT);
+        testPass("-1", "-1", STRICT);
+        testPass("0.1", "0.1", STRICT);
+        testPass("1.2e5", "1.2e5", STRICT);
+        testPass("20.4e-1", "20.4e-1", STRICT);
+        testFail("310.1e-1", "31.01", STRICT); // should fail though numbers are the same?
+    }
+
     @Test
     public void testSimple() throws JSONException {
         testPass("{id:1}", "{id:1}", STRICT);
