X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FReadDataReplyTest.java;h=1d42d12eb8242a6a09b417bfd5c2df4b6c3272f6;hb=4f1f2ae598588f6aa5aac59b2206d97ad402a193;hp=7ad45a61702607cdaf03a61b23573575d54830cd;hpb=8aeb4a575b7b5988e3a50d6c9a4c05418c926fd9;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java index 7ad45a6170..1d42d12eb8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java @@ -13,7 +13,6 @@ import org.apache.commons.lang.SerializationUtils; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; @@ -45,29 +44,7 @@ public class ReadDataReplyTest { @Test public void testIsSerializedType() { - assertEquals("isSerializedType", true, ReadDataReply.isSerializedType( - ShardTransactionMessages.ReadDataReply.newBuilder().build())); assertEquals("isSerializedType", true, ReadDataReply.isSerializedType(new ReadDataReply())); assertEquals("isSerializedType", false, ReadDataReply.isSerializedType(new Object())); } - - /** - * Tests backwards compatible serialization/deserialization of a ReadDataReply message with the - * base and R1 Helium versions, which used the protobuff ReadDataReply message. - */ - @Test - public void testSerializationWithHeliumR1Version() throws Exception { - NormalizedNode data = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). - withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); - - ReadDataReply expected = new ReadDataReply(data, DataStoreVersions.HELIUM_1_VERSION); - - Object serialized = expected.toSerializable(); - assertEquals("Serialized type", ShardTransactionMessages.ReadDataReply.class, serialized.getClass()); - - ReadDataReply actual = ReadDataReply.fromSerializable(SerializationUtils.clone( - (Serializable) serialized)); - assertEquals("getNormalizedNode", expected.getNormalizedNode(), actual.getNormalizedNode()); - } }