Fixes Issue stleary#611 JsonObject.similar() returns after number entry check

stleary · stleary · commit cfbc306673ba · 2021-07-18T10:32:49.000-05:00
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -2092,7 +2092,9 @@ public boolean similar(Object other) {
                         return false;
                     }
                 } else if (valueThis instanceof Number && valueOther instanceof Number) {
-                    return isNumberSimilar((Number)valueThis, (Number)valueOther);
+                    if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {
+                    	return false;
+                    };
                 } else if (!valueThis.equals(valueOther)) {
                     return false;
                 }
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -100,6 +100,7 @@ public class JSONObjectTest {
     @Test
     public void verifySimilar() {
         final String string1 = "HasSameRef";
+        final String string2 = "HasDifferentRef";
         JSONObject obj1 = new JSONObject()
                 .put("key1", "abc")
                 .put("key2", 2)
@@ -119,12 +120,16 @@ public void verifySimilar() {
                 .put("key1", "abc")
                 .put("key2", 2.0)
                 .put("key3", new String(string1));
-        
-        assertFalse("Should eval to false", obj1.similar(obj2));
 
-        assertTrue("Should eval to true", obj1.similar(obj3));
+        JSONObject obj5 = new JSONObject()
+                .put("key1", "abc")
+                .put("key2", 2.0)
+                .put("key3", new String(string2));
         
-        assertTrue("Should eval to true", obj1.similar(obj4));
+        assertFalse("obj1-obj2 Should eval to false", obj1.similar(obj2));
+        assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
+        assertTrue("obj1-obj4 Should eval to true", obj1.similar(obj4));
+        assertFalse("obj1-obj5 Should eval to false", obj1.similar(obj5));
         
     }
     

Original file line number	Diff line number	Diff line change
`@@ -2092,7 +2092,9 @@ public boolean similar(Object other) {`
`2092`	`2092`	`return false;`
`2093`	`2093`	`}`
`2094`	`2094`	`} else if (valueThis instanceof Number && valueOther instanceof Number) {`
`2095`		`- return isNumberSimilar((Number)valueThis, (Number)valueOther);`
	`2095`	`+ if (!isNumberSimilar((Number)valueThis, (Number)valueOther)) {`
	`2096`	`+ return false;`
	`2097`	`+ };`
`2096`	`2098`	`} else if (!valueThis.equals(valueOther)) {`
`2097`	`2099`	`return false;`
`2098`	`2100`	`}`