Checking for null JSON strings prior to the JSONCompare so that it doesn't throw a NullPointerException.

AdrianAcala · AdrianAcala · commit ccc44f4e0476 · 2016-02-24T20:53:32.000-08:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONAssert.java b/src/main/java/org/skyscreamer/jsonassert/JSONAssert.java
@@ -217,6 +217,12 @@ public static void assertNotEquals(String expectedStr, String actualStr, boolean
      */
     public static void assertEquals(String expectedStr, String actualStr, JSONCompareMode compareMode)
             throws JSONException {
+        if (expectedStr==actualStr) return;
+        if (expectedStr==null){
+            throw new AssertionError("Expected string is null.");
+        }else if (actualStr==null){
+            throw new AssertionError("Actual string is null.");
+        }
         JSONCompareResult result = JSONCompare.compareJSON(expectedStr, actualStr, compareMode);
         if (result.failed()) {
             throw new AssertionError(result.getMessage());
