Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 03:15:32 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
stleary 2021-07-18 19:53:23 -05:00
parent cfbc306673
commit c6089e53f5
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/json/JSONArray.java
View File

@ -1383,7 +1383,9 @@ public class JSONArray implements Iterable<Object> {
return false; return false;
} }
} else if (valueThis instanceof Number && valueOther instanceof Number) { } 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)) { } else if (!valueThis.equals(valueOther)) {
return false; return false;
} }

17
src/test/java/org/json/junit/JSONArrayTest.java
View File

@ -87,6 +87,7 @@ public class JSONArrayTest {
@Test @Test
public void verifySimilar() { public void verifySimilar() {
final String string1 = "HasSameRef"; final String string1 = "HasSameRef";
final String string2 = "HasDifferentRef";
JSONArray obj1 = new JSONArray() JSONArray obj1 = new JSONArray()
.put("abc") .put("abc")
.put(string1) .put(string1)
@ -101,10 +102,20 @@ public class JSONArrayTest {
.put("abc") .put("abc")
.put(new String(string1)) .put(new String(string1))
.put(2); .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)); assertFalse("obj1-obj2 Should eval to false", obj1.similar(obj2));
assertTrue("obj1-obj3 Should eval to true", obj1.similar(obj3));
assertTrue("Should eval to true", obj1.similar(obj3)); assertFalse("obj4-obj5 Should eval to false", obj4.similar(obj5));
} }
/** /**