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=9412c00daf7c8c3f108d1284a6288753ba67f6ac;hp=8ce73296c14cd0af90491ae4f87e99fa85637c5e;hpb=989c3723e634bf4a0fb671246c31eadf255c462c;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 8ce73296c1..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;
@@ -32,41 +31,20 @@ public class ReadDataReplyTest {
                 new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).
                 withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
 
-        ReadDataReply expected = new ReadDataReply(data);
+        ReadDataReply expected = new ReadDataReply(data, DataStoreVersions.CURRENT_VERSION);
 
-        Object serialized = expected.toSerializable(DataStoreVersions.CURRENT_VERSION);
+        Object serialized = expected.toSerializable();
         assertEquals("Serialized type", ReadDataReply.class, serialized.getClass());
 
         ReadDataReply actual = ReadDataReply.fromSerializable(SerializationUtils.clone(
                 (Serializable) serialized));
+        assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, actual.getVersion());
         assertEquals("getNormalizedNode", expected.getNormalizedNode(), actual.getNormalizedNode());
     }
 
     @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);
-
-        Object serialized = expected.toSerializable(DataStoreVersions.HELIUM_1_VERSION);
-        assertEquals("Serialized type", ShardTransactionMessages.ReadDataReply.class, serialized.getClass());
-
-        ReadDataReply actual = ReadDataReply.fromSerializable(SerializationUtils.clone(
-                (Serializable) serialized));
-        assertEquals("getNormalizedNode", expected.getNormalizedNode(), actual.getNormalizedNode());
-    }
 }