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

stleary · stleary · commit c6089e53f553 · 2021-07-18T19:53:23.000-05:00
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
@@ -1383,7 +1383,9 @@ public boolean similar(Object other) {
                     return false;
                 }
             } else if (valueThis instanceof Number && valueOther instanceof Number) {
-                return JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther);
+                if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {
+                	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
@@ -87,6 +87,7 @@ public class JSONArrayTest {
     @Test
     public void verifySimilar() {
         final String string1 = "HasSameRef";
+        final String string2 = "HasDifferentRef";
         JSONArray obj1 = new JSONArray()
                 .put("abc")
                 .put(string1)
@@ -101,10 +102,20 @@ public void verifySimilar() {
                 .put("abc")
                 .put(new String(string1))
                 .put(2);
+
+        JSONArray obj4 = new JSONArray()
+                .put("abc")
+                .put(2.0)
+        		.put(new String(string1));
+
+        JSONArray obj5 = new JSONArray()
+                .put("abc")
+                .put(2.0)
+        		.put(new String(string2));
         
-        assertFalse("Should eval to false", obj1.similar(obj2));
-        
-        assertTrue("Should eval to true", obj1.similar(obj3));
+        assertFalse("obj1-obj2 Should eval to false", obj1.similar(obj2));
+        assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
+        assertFalse("obj4-obj5 Should eval to false", obj4.similar(obj5));
     }
         
     /**

Original file line number	Diff line number	Diff line change
`@@ -1383,7 +1383,9 @@ public boolean similar(Object other) {`
`1383`	`1383`	`return false;`
`1384`	`1384`	`}`
`1385`	`1385`	`} else if (valueThis instanceof Number && valueOther instanceof Number) {`
`1386`		`- return JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther);`
	`1386`	`+ if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) {`
	`1387`	`+ return false;`
	`1388`	`+ }`
`1387`	`1389`	`} else if (!valueThis.equals(valueOther)) {`
`1388`	`1390`	`return false;`
`1389`	`1391`	`}`