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%2FCreateTransactionTest.java;h=d1ec8072b0d29f4ecbb3330622b6cc9a0731e94c;hb=c1336f9b497bc6867536a24f629c3f0b002ccb2f;hp=a558b75ce48e394ce5329aaef2094dc253bfa856;hpb=24c074a4b32ac97980a652b78824b7c2f97ffb78;p=controller.git 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 a558b75ce4..d1ec8072b0 100644 --- 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,9 +8,11 @@ package org.opendaylight.controller.cluster.datastore.messages; import static org.junit.Assert.assertEquals; + 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; /** @@ -18,11 +20,11 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @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()); @@ -31,14 +33,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 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()); @@ -47,7 +48,6 @@ 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()); }