Repository: curator Updated Branches: refs/heads/CURATOR-394 b6b9e1cc4 -> ee18fd55f
bad commit Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ee18fd55 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ee18fd55 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ee18fd55 Branch: refs/heads/CURATOR-394 Commit: ee18fd55f71e320050671541c7ed9435f3895a81 Parents: b6b9e1c Author: randgalt <randg...@apache.org> Authored: Fri Mar 24 19:28:11 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Fri Mar 24 19:28:11 2017 -0500 ---------------------------------------------------------------------- .../x/discovery/TestJsonInstanceSerializer.java | 136 ++++++++----------- 1 file changed, 55 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/ee18fd55/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestJsonInstanceSerializer.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestJsonInstanceSerializer.java b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestJsonInstanceSerializer.java index ae49dbf..f17919d 100644 --- a/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestJsonInstanceSerializer.java +++ b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestJsonInstanceSerializer.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.curator.x.discovery; -import org.apache.curator.x.discovery.details.JsonInstanceSerializer; -import org.testng.Assert; -import org.testng.annotations.Test; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.curator.x.discovery.details.JsonInstanceSerializer; +import org.testng.Assert; +import org.testng.annotations.Test; + public class TestJsonInstanceSerializer { @Test - public void testBasic() throws Exception + public void testBasic() throws Exception { - JsonInstanceSerializer<String> serializer = new JsonInstanceSerializer<String>(String.class); - ServiceInstance<String> instance = new ServiceInstance<String>("name", "id", "address", 10, 20, "payload", 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true); - byte[] bytes = serializer.serialize(instance); + JsonInstanceSerializer<String> serializer = new JsonInstanceSerializer<String>(String.class); + ServiceInstance<String> instance = new ServiceInstance<String>("name", "id", "address", 10, 20, "payload", 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true); + byte[] bytes = serializer.serialize(instance); - ServiceInstance<String> rhs = serializer.deserialize(bytes); + ServiceInstance<String> rhs = serializer.deserialize(bytes); Assert.assertEquals(instance, rhs); Assert.assertEquals(instance.getId(), rhs.getId()); Assert.assertEquals(instance.getName(), rhs.getName()); @@ -49,12 +49,12 @@ public class TestJsonInstanceSerializer } @Test - public void testWrongPayloadType() throws Exception + public void testWrongPayloadType() throws Exception { - JsonInstanceSerializer<String> stringSerializer = new JsonInstanceSerializer<String>(String.class); - JsonInstanceSerializer<Double> doubleSerializer = new JsonInstanceSerializer<Double>(Double.class); + JsonInstanceSerializer<String> stringSerializer = new JsonInstanceSerializer<String>(String.class); + JsonInstanceSerializer<Double> doubleSerializer = new JsonInstanceSerializer<Double>(Double.class); - byte[] bytes = stringSerializer.serialize(new ServiceInstance<String>("name", "id", "address", 10, 20, "payload", 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true)); + byte[] bytes = stringSerializer.serialize(new ServiceInstance<String>("name", "id", "address", 10, 20, "payload", 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true)); try { doubleSerializer.deserialize(bytes); @@ -67,13 +67,13 @@ public class TestJsonInstanceSerializer } @Test - public void testNoPayload() throws Exception + public void testNoPayload() throws Exception { - JsonInstanceSerializer<Void> serializer = new JsonInstanceSerializer<Void>(Void.class); - ServiceInstance<Void> instance = new ServiceInstance<Void>("name", "id", "address", 10, 20, null, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true); - byte[] bytes = serializer.serialize(instance); + JsonInstanceSerializer<Void> serializer = new JsonInstanceSerializer<Void>(Void.class); + ServiceInstance<Void> instance = new ServiceInstance<Void>("name", "id", "address", 10, 20, null, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true); + byte[] bytes = serializer.serialize(instance); - ServiceInstance<Void> rhs = serializer.deserialize(bytes); + ServiceInstance<Void> rhs = serializer.deserialize(bytes); Assert.assertEquals(instance, rhs); Assert.assertEquals(instance.getId(), rhs.getId()); Assert.assertEquals(instance.getName(), rhs.getName()); @@ -86,26 +86,26 @@ public class TestJsonInstanceSerializer } @Test - public void testNoEnabledState() throws Exception + public void testNoEnabledState() throws Exception { - JsonInstanceSerializer<Void> serializer = new JsonInstanceSerializer<Void>(Void.class); - byte[] bytes = "{}".getBytes("utf-8"); + JsonInstanceSerializer<Void> serializer = new JsonInstanceSerializer<Void>(Void.class); + byte[] bytes = "{}".getBytes("utf-8"); - ServiceInstance<Void> instance = serializer.deserialize(bytes); + ServiceInstance<Void> instance = serializer.deserialize(bytes); Assert.assertTrue(instance.isEnabled(), "Instance that has no 'enabled' should be assumed enabled"); } @Test - public void testPayloadAsList() throws Exception + public void testPayloadAsList() throws Exception { - JsonInstanceSerializer<Object> serializer = new JsonInstanceSerializer<Object>(Object.class); + JsonInstanceSerializer<Object> serializer = new JsonInstanceSerializer<Object>(Object.class); List<String> payload = new ArrayList<String>(); payload.add("Test value 1"); payload.add("Test value 2"); - ServiceInstance<Object> instance = new ServiceInstance<Object>("name", "id", "address", 10, 20, payload, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), false); - byte[] bytes = serializer.serialize(instance); + ServiceInstance<Object> instance = new ServiceInstance<Object>("name", "id", "address", 10, 20, payload, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), false); + byte[] bytes = serializer.serialize(instance); - ServiceInstance<Object> rhs = serializer.deserialize(bytes); + ServiceInstance<Object> rhs = serializer.deserialize(bytes); Assert.assertEquals(instance, rhs); Assert.assertEquals(instance.getId(), rhs.getId()); Assert.assertEquals(instance.getName(), rhs.getName()); @@ -117,17 +117,18 @@ public class TestJsonInstanceSerializer Assert.assertEquals(instance.isEnabled(), rhs.isEnabled()); } + @Test - public void testPayloadAsMap() throws Exception + public void testPayloadAsMap() throws Exception { - JsonInstanceSerializer<Object> serializer = new JsonInstanceSerializer<Object>(Object.class); - Map<String, String> payload = new HashMap<String, String>(); + JsonInstanceSerializer<Object> serializer = new JsonInstanceSerializer<Object>(Object.class); + Map<String,String> payload = new HashMap<String,String>(); payload.put("1", "Test value 1"); payload.put("2", "Test value 2"); - ServiceInstance<Object> instance = new ServiceInstance<Object>("name", "id", "address", 10, 20, payload, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), false); - byte[] bytes = serializer.serialize(instance); + ServiceInstance<Object> instance = new ServiceInstance<Object>("name", "id", "address", 10, 20, payload, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), false); + byte[] bytes = serializer.serialize(instance); - ServiceInstance<Object> rhs = serializer.deserialize(bytes); + ServiceInstance<Object> rhs = serializer.deserialize(bytes); Assert.assertEquals(instance, rhs); Assert.assertEquals(instance.getId(), rhs.getId()); Assert.assertEquals(instance.getName(), rhs.getName()); @@ -140,15 +141,15 @@ public class TestJsonInstanceSerializer } @Test - public void testPayloadClass() throws Exception + public void testPayloadClass() throws Exception { - JsonInstanceSerializer<Payload> serializer = new JsonInstanceSerializer<Payload>(Payload.class); + JsonInstanceSerializer<Payload> serializer = new JsonInstanceSerializer<Payload>(Payload.class); Payload payload = new Payload(); payload.setVal("Test value"); - ServiceInstance<Payload> instance = new ServiceInstance<Payload>("name", "id", "address", 10, 20, payload, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true); - byte[] bytes = serializer.serialize(instance); + ServiceInstance<Payload> instance = new ServiceInstance<Payload>("name", "id", "address", 10, 20, payload, 0, ServiceType.DYNAMIC, new UriSpec("{a}/b/{c}"), true); + byte[] bytes = serializer.serialize(instance); - ServiceInstance<Payload> rhs = serializer.deserialize(bytes); + ServiceInstance<Payload> rhs = serializer.deserialize(bytes); Assert.assertEquals(instance, rhs); Assert.assertEquals(instance.getId(), rhs.getId()); Assert.assertEquals(instance.getName(), rhs.getName()); @@ -160,48 +161,21 @@ public class TestJsonInstanceSerializer Assert.assertEquals(instance.isEnabled(), rhs.isEnabled()); } - public static class Payload - { - private String val; - - public Payload(String val) - { - this.val = val; - } - - public Payload() - { - } - - public String getVal() - { - return val; - } - - public void setVal(String val) - { - this.val = val; - } - - @Override - public int hashCode() - { - return val != null ? val.hashCode() : 0; - } - - @Override - public boolean equals(Object other) - { - if ( other == null || !(other instanceof Payload) ) - { - return false; - } - String otherVal = ((Payload)other).getVal(); - if ( val == null ) - { - return val.equals(otherVal); - } - return val.equals(otherVal); - } + public static class Payload { + private String val; + public String getVal() { + return val; + } + public void setVal(String val) { + this.val = val; + } + @Override + public boolean equals(Object other) { + if (other == null || !(other instanceof Payload)) return false; + String otherVal = ((Payload)other).getVal(); + if (val == null) return val == otherVal; + return val.equals(otherVal); + } } + }
