From a04ac0c2fea6491173a085e4f8ff59c0ba656542 Mon Sep 17 00:00:00 2001 From: David Xia Date: Wed, 14 Nov 2018 01:18:34 -0500 Subject: [PATCH 1/2] Add failing equality test for V1Secret --- .../client/models/V1SecretTest.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 kubernetes/src/test/java/io/kubernetes/client/models/V1SecretTest.java diff --git a/kubernetes/src/test/java/io/kubernetes/client/models/V1SecretTest.java b/kubernetes/src/test/java/io/kubernetes/client/models/V1SecretTest.java new file mode 100644 index 0000000000..411a354436 --- /dev/null +++ b/kubernetes/src/test/java/io/kubernetes/client/models/V1SecretTest.java @@ -0,0 +1,30 @@ +package io.kubernetes.client.models; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + +import java.util.HashMap; +import java.util.Map; +import org.junit.Test; + +public class V1SecretTest { + + @Test + public void testEquals() { + final Map data1 = new HashMap<>(); + data1.put("foo", new byte[]{1, 2, 3, 4}); + data1.put("bar", new byte[]{5, 6, 7, 8}); + final V1Secret secret1 = new V1SecretBuilder() + .withData(data1) + .build(); + + final Map data2 = new HashMap<>(); + data2.put("foo", new byte[]{1, 2, 3, 4}); + data2.put("bar", new byte[]{5, 6, 7, 8}); + final V1Secret secret2 = new V1SecretBuilder() + .withData(data2) + .build(); + + assertThat(secret1, equalTo(secret2)); + } +} From 27e51b19a9f53346b1547fa4a58a7b154a8d1d7e Mon Sep 17 00:00:00 2001 From: David Xia Date: Wed, 14 Nov 2018 01:20:00 -0500 Subject: [PATCH 2/2] Show that Objects.deepEquals() does not fix V1Secret.equals() --- .../src/main/java/io/kubernetes/client/models/V1Secret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/src/main/java/io/kubernetes/client/models/V1Secret.java b/kubernetes/src/main/java/io/kubernetes/client/models/V1Secret.java index 1ffbc1f5e9..5c8ccf3479 100644 --- a/kubernetes/src/main/java/io/kubernetes/client/models/V1Secret.java +++ b/kubernetes/src/main/java/io/kubernetes/client/models/V1Secret.java @@ -186,7 +186,7 @@ public boolean equals(java.lang.Object o) { } V1Secret v1Secret = (V1Secret) o; return Objects.equals(this.apiVersion, v1Secret.apiVersion) && - Objects.equals(this.data, v1Secret.data) && + Objects.deepEquals(this.data, v1Secret.data) && Objects.equals(this.kind, v1Secret.kind) && Objects.equals(this.metadata, v1Secret.metadata) && Objects.equals(this.stringData, v1Secret.stringData) &&