Align tested boolean/Boolean expectations

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / messages / ReadDataReplyTest.java

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 8ce73296c14cd0af90491ae4f87e99fa85637c5e..caf55737be8df8e294fd8eba801edf986d0078eb 100644 (file)
--- 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
@@ -8,12 +8,14 @@
 package org.opendaylight.controller.cluster.datastore.messages;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.Serializable;
 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;
@@ -28,45 +30,24 @@ public class ReadDataReplyTest {
 
     @Test
     public void testSerialization() {
-        NormalizedNode<?, ?> data = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
-                new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).
-                withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
+        NormalizedNode<?, ?> data = ImmutableContainerNodeBuilder.create()
+                .withNodeIdentifier(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());
+        assertTrue("isSerializedType", ReadDataReply.isSerializedType(new ReadDataReply()));
+        assertFalse("isSerializedType", ReadDataReply.isSerializedType(new Object()));
     }
 }