From 14c3add920fe05531c3af7aae8df51a9ac9da0a8 Mon Sep 17 00:00:00 2001
From: Michael Edgar <michael@xlate.io>
Date: Sun, 2 Apr 2023 12:14:04 -0400
Subject: [PATCH] Avoid NullPointerException describing null value

Signed-off-by: Michael Edgar <michael@xlate.io>
---
 .../jsonassert/JSONCompareResult.java         |  2 +-
 .../comparator/DefaultComparator.java         |  5 ++--
 .../jsonassert/JSONCompareTest.java           | 27 +++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
index 28406fb..5567209 100644
--- a/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
+++ b/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
@@ -245,7 +245,7 @@ private static String describe(Object value) {
         } else if (value instanceof JSONObject) {
             return "a JSON object";
         } else {
-            return value.toString();
+            return String.valueOf(value);
         }
     }
 
diff --git a/src/main/java/org/skyscreamer/jsonassert/comparator/DefaultComparator.java b/src/main/java/org/skyscreamer/jsonassert/comparator/DefaultComparator.java
index bc71eae..cb7274f 100644
--- a/src/main/java/org/skyscreamer/jsonassert/comparator/DefaultComparator.java
+++ b/src/main/java/org/skyscreamer/jsonassert/comparator/DefaultComparator.java
@@ -53,10 +53,9 @@ public void compareValues(String prefix, Object expectedValue, Object actualValu
         if (expectedValue == actualValue) {
             return;
         }
-        if ((expectedValue == null && actualValue != null) || (expectedValue != null && actualValue == null)) {
+        if (expectedValue == null || actualValue == null) {
             result.fail(prefix, expectedValue, actualValue);
-        }
-        if (areNumbers(expectedValue, actualValue)) {
+        } else if (areNumbers(expectedValue, actualValue)) {
             if (areNotSameDoubles(expectedValue, actualValue)) {
                 result.fail(prefix, expectedValue, actualValue);
             }
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java
index 450adfd..fcb2ee8 100644
--- a/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java
+++ b/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java
@@ -21,6 +21,7 @@
 import static org.skyscreamer.jsonassert.JSONCompare.compareJSON;
 import static org.skyscreamer.jsonassert.JSONCompareMode.LENIENT;
 import static org.skyscreamer.jsonassert.JSONCompareMode.NON_EXTENSIBLE;
+import static org.skyscreamer.jsonassert.JSONCompareMode.STRICT;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -159,6 +160,32 @@ public void reportsUnmatchedJSONArrayWhereExpectedContainsJSONObjectWithUniqueKe
         assertThat(result, failsWithMessage(equalTo("[0] Could not find match for element {\"id\":3}")));
     }
 
+    @Test
+    public void reportsUnmatchedJSONArrayWhereExpectedContainsNonnullIntegerButActualContainsNullElement() throws JSONException {
+        JSONCompareResult result = compareJSON("[ 3 ]", "[ null ]", LENIENT);
+        assertThat(result, failsWithMessage(equalTo("[]\nExpected: 3\n     but none found\n ; " +
+                "[]\nUnexpected: null\n")));
+    }
+
+    @Test
+    public void reportsUnmatchedJSONArrayWhereExpectedContainsNullElementButActualContainsNonnullInteger() throws JSONException {
+        JSONCompareResult result = compareJSON("[ null ]", "[ 3 ]", LENIENT);
+        assertThat(result, failsWithMessage(equalTo("[]\nExpected: null\n     but none found\n ; " +
+                "[]\nUnexpected: 3\n")));
+    }
+
+    @Test
+    public void reportsStrictUnmatchedJSONArrayWhereExpectedContainsNonnullIntegerButActualContainsNullElement() throws JSONException {
+        JSONCompareResult result = compareJSON("[ 3 ]", "[ null ]", STRICT);
+        assertThat(result, failsWithMessage(equalTo("[0]\nExpected: 3\n     got: null\n")));
+    }
+
+    @Test
+    public void reportsStrictUnmatchedJSONArrayWhereExpectedContainsNullButActualContainsNonnullInteger() throws JSONException {
+        JSONCompareResult result = compareJSON("[ null ]", "[ 3 ]", STRICT);
+        assertThat(result, failsWithMessage(equalTo("[0]\nExpected: null\n     got: 3\n")));
+    }
+
     private Matcher<JSONCompareResult> failsWithMessage(final Matcher<String> expectedMessage) {
         return new TypeSafeMatcher<JSONCompareResult>() {
             @Override