From ccc44f4e0476d15d346f486099d1d4e8aaa8f134 Mon Sep 17 00:00:00 2001 From: Adrian-Ryan Acala Date: Wed, 24 Feb 2016 20:21:01 -0800 Subject: [PATCH] Checking for null JSON strings prior to the JSONCompare so that it doesn't throw a NullPointerException. --- src/main/java/org/skyscreamer/jsonassert/JSONAssert.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONAssert.java b/src/main/java/org/skyscreamer/jsonassert/JSONAssert.java index 10ce2c1..342d5d3 100644 --- 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());