From 89f16ad0af9f7c1097a4336c8fda02afd4b87563 Mon Sep 17 00:00:00 2001
From: Scott Paffrath <33729384+spaffrath@users.noreply.github.com>
Date: Fri, 5 Aug 2022 11:00:33 -0700
Subject: [PATCH] Issue 682 JSONString similarity

---
 src/main/java/org/json/JSONArray.java         |  4 ++++
 src/main/java/org/json/JSONObject.java        |  4 ++++
 .../java/org/json/junit/JSONArrayTest.java    | 24 +++++++++++++++++++
 .../java/org/json/junit/JSONObjectTest.java   | 22 +++++++++++++++++
 4 files changed, 54 insertions(+)

diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
index 2b33e1d..7f09114 100644
--- a/src/main/java/org/json/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -1386,6 +1386,10 @@ public class JSONArray implements Iterable<Object> {
                 if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {
                 	return false;
                 }
+            } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
+                if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
+                    return false;
+                }
             } else if (!valueThis.equals(valueOther)) {
                 return false;
             }
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index ea549e3..859b3e5 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -2142,6 +2142,10 @@ public class JSONObject {
                     if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {
                     	return false;
                     }
+                } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {
+                    if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {
+                    	return false;
+                    }
                 } else if (!valueThis.equals(valueOther)) {
                     return false;
                 }
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 987891e..959954b 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -26,6 +26,7 @@ SOFTWARE.
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -49,7 +50,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONPointerException;
+import org.json.JSONString;
 import org.json.JSONTokener;
+import org.json.junit.data.MyJsonString;
 import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
@@ -1298,4 +1301,25 @@ public class JSONArrayTest {
         assertNotNull(json_input);
         fail("Excepected Exception.");
     }
+
+    @Test
+    public void testIssue682SimilarityOfJSONString() {
+        JSONArray ja1 = new JSONArray()
+                .put(new MyJsonString())
+                .put(2);
+        JSONArray ja2 = new JSONArray()
+                .put(new MyJsonString())
+                .put(2);
+        assertTrue(ja1.similar(ja2));
+
+        JSONArray ja3 = new JSONArray()
+                .put(new JSONString() {
+                    @Override
+                    public String toJSONString() {
+                        return "\"different value\"";
+                    }
+                })
+                .put(2);
+        assertFalse(ja1.similar(ja3));
+    }
 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 2ba58bf..d244f2f 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -57,6 +57,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONPointerException;
+import org.json.JSONString;
 import org.json.JSONTokener;
 import org.json.XML;
 import org.json.junit.data.BrokenToString;
@@ -3398,4 +3399,25 @@ public class JSONObjectTest {
         assertNotNull(json_input);
         fail("Excepected Exception.");
     }
+
+    @Test
+    public void testIssue682SimilarityOfJSONString() {
+        JSONObject jo1 = new JSONObject()
+                .put("a", new MyJsonString())
+                .put("b", 2);
+        JSONObject jo2 = new JSONObject()
+                .put("a", new MyJsonString())
+                .put("b", 2);
+        assertTrue(jo1.similar(jo2));
+
+        JSONObject jo3 = new JSONObject()
+                .put("a", new JSONString() {
+                    @Override
+                    public String toJSONString() {
+                        return "\"different value\"";
+                    }
+                })
+                .put("b", 2);
+        assertFalse(jo1.similar(jo3));
+    }
 }