Repository: johnzon Updated Branches: refs/heads/master 249301acd -> 180eb6133
JOHNZON-124 ensure JsonArray#equals is portable Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/180eb613 Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/180eb613 Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/180eb613 Branch: refs/heads/master Commit: 180eb6133e4194832541bbd0c29b23e40765617c Parents: 249301a Author: rmannibucau <[email protected]> Authored: Tue Jun 6 10:05:23 2017 +0200 Committer: rmannibucau <[email protected]> Committed: Tue Jun 6 10:05:23 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/johnzon/core/JsonArrayImpl.java | 3 +-- .../test/java/org/apache/johnzon/core/JsonArrayImplTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/180eb613/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java ---------------------------------------------------------------------- diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java index cfb563d..1d880c7 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java @@ -179,8 +179,7 @@ class JsonArrayImpl extends AbstractList<JsonValue> implements JsonArray, Serial @Override public boolean equals(final Object obj) { - return JsonArrayImpl.class.isInstance(obj) - && unmodifieableBackingList.equals(JsonArrayImpl.class.cast(obj).unmodifieableBackingList); + return JsonArray.class.isInstance(obj) && super.equals(obj); } @Override http://git-wip-us.apache.org/repos/asf/johnzon/blob/180eb613/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java ---------------------------------------------------------------------- diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java index b0918b1..8b6dac7 100644 --- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java +++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java @@ -58,4 +58,12 @@ public class JsonArrayImplTest { assertTrue(array.isEmpty()); assertEquals("[]", array.toString()); } + + @Test + public void equals() { + assertTrue(Json.createArrayBuilder().build().equals(Json.createArrayBuilder().build())); + assertTrue(Json.createArrayBuilder().add(1).build().equals(Json.createArrayBuilder().add(1).build())); + assertFalse(Json.createArrayBuilder().add(1).build().equals(Json.createArrayBuilder().add(2).build())); + assertFalse(Json.createArrayBuilder().add(1).build().equals(Json.createArrayBuilder().build())); + } }
