Merge pull request #683 from spaffrath/Issue_682_JSONString_similarity

stleary · web-flow · commit 346fb26f2dca · 2022-08-26T20:57:22.000-05:00
Issue 682 JSONString similarity
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
@@ -1386,6 +1386,10 @@ public boolean similar(Object other) {
                 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
@@ -2146,6 +2146,10 @@ public boolean similar(Object other) {
                     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
@@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 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 @@ of this software and associated documentation files (the "Software"), to deal
 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;
@@ -1354,4 +1357,25 @@ public void issue654StackOverflowInputWellFormed() {
         fail("Excepected Exception.");
         Util.checkJSONArrayMaps(json_input);
     }
+
+    @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
@@ -50,6 +50,7 @@ of this software and associated documentation files (the "Software"), to deal
 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;
@@ -3507,4 +3508,25 @@ public void issue654StackOverflowInputWellFormed() {
         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));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1386,6 +1386,10 @@ public boolean similar(Object other) {`
`1386`	`1386`	`if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {`
`1387`	`1387`	`return false;`
`1388`	`1388`	`}`
	`1389`	`+ } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {`
	`1390`	`+ if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {`
	`1391`	`+ return false;`
	`1392`	`+ }`
`1389`	`1393`	`} else if (!valueThis.equals(valueOther)) {`
`1390`	`1394`	`return false;`
`1391`	`1395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2146,6 +2146,10 @@ public boolean similar(Object other) {`
`2146`	`2146`	`if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {`
`2147`	`2147`	`return false;`
`2148`	`2148`	`}`
	`2149`	`+ } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) {`
	`2150`	`+ if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) {`
	`2151`	`+ return false;`
	`2152`	`+ }`
`2149`	`2153`	`} else if (!valueThis.equals(valueOther)) {`
`2150`	`2154`	`return false;`
`2151`	`2155`	`}`