Align tested boolean/Boolean expectations

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java
index 771d091ab79b0d6dd7f967c72142926b99cad875..2e83a33e0ab2996b23be8c760532e5673900aea5 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java
@@ -8,22 +8,25 @@
 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.AbstractTest;
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
-import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
 
 /**
  * Unit tests for CreateTransaction.
  *
  * @author Thomas Pantelis
  */
-public class CreateTransactionTest {
+public class CreateTransactionTest extends AbstractTest {
 
     @Test
     public void testSerialization() {
-        CreateTransaction expected = new CreateTransaction("txId", 2, "chainId", DataStoreVersions.CURRENT_VERSION);
+        CreateTransaction expected = new CreateTransaction(nextTransactionId(), 2, DataStoreVersions.CURRENT_VERSION);
 
         Object serialized = expected.toSerializable();
         assertEquals("Serialized type", CreateTransaction.class, serialized.getClass());
@@ -32,29 +35,13 @@ public class CreateTransactionTest {
                 SerializationUtils.clone((Serializable) serialized));
         assertEquals("getTransactionId", expected.getTransactionId(), actual.getTransactionId());
         assertEquals("getTransactionType", expected.getTransactionType(), actual.getTransactionType());
-        assertEquals("getTransactionChainId", expected.getTransactionChainId(), actual.getTransactionChainId());
         assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, actual.getVersion());
     }
 
-    @Test
-    public void testSerializationWithPreBoronVersion() {
-        CreateTransaction expected = new CreateTransaction("txId", 2, "chainId", DataStoreVersions.LITHIUM_VERSION);
-
-        Object serialized = expected.toSerializable();
-        assertEquals("Serialized type", ShardTransactionMessages.CreateTransaction.class, serialized.getClass());
-
-        CreateTransaction actual = CreateTransaction.fromSerializable(
-                SerializationUtils.clone((Serializable) serialized));
-        assertEquals("getTransactionId", expected.getTransactionId(), actual.getTransactionId());
-        assertEquals("getTransactionType", expected.getTransactionType(), actual.getTransactionType());
-        assertEquals("getTransactionChainId", expected.getTransactionChainId(), actual.getTransactionChainId());
-        assertEquals("getVersion", DataStoreVersions.LITHIUM_VERSION, actual.getVersion());
-    }
-
     @Test
     public void testSerializationWithNewerVersion() {
         short newerVersion = DataStoreVersions.CURRENT_VERSION + (short)1;
-        CreateTransaction expected = new CreateTransaction("txId", 2, "chainId", newerVersion);
+        CreateTransaction expected = new CreateTransaction(nextTransactionId(), 2, newerVersion);
 
         Object serialized = expected.toSerializable();
         assertEquals("Serialized type", CreateTransaction.class, serialized.getClass());
@@ -63,17 +50,12 @@ public class CreateTransactionTest {
                 SerializationUtils.clone((Serializable) serialized));
         assertEquals("getTransactionId", expected.getTransactionId(), actual.getTransactionId());
         assertEquals("getTransactionType", expected.getTransactionType(), actual.getTransactionType());
-        assertEquals("getTransactionChainId", expected.getTransactionChainId(), actual.getTransactionChainId());
         assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, actual.getVersion());
     }
 
     @Test
     public void testIsSerializedType() {
-        assertEquals("isSerializedType", true, CreateTransaction.isSerializedType(
-                ShardTransactionMessages.CreateTransaction.newBuilder().setTransactionId("")
-                    .setTransactionType(2).setTransactionChainId("").setMessageVersion(4).build()));
-
-        assertEquals("isSerializedType", true, CreateTransaction.isSerializedType(new CreateTransaction()));
-        assertEquals("isSerializedType", false, CreateTransaction.isSerializedType(new Object()));
+        assertTrue("isSerializedType", CreateTransaction.isSerializedType(new CreateTransaction()));
+        assertFalse("isSerializedType", CreateTransaction.isSerializedType(new Object()));
     }
 }