Convert CDS implementation to use msdal APIs

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java
index 78c26861e9691ae9c0b56c34e45d88f0458368d7..bf6146f543bb3e25e6cca728eb3832ff829acddb 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java
@@ -8,11 +8,12 @@
 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.DataStoreVersions;
-import org.opendaylight.controller.protobuff.messages.cohort3pc.ThreePhaseCommitCohortMessages;
+import org.opendaylight.controller.cluster.datastore.MockIdentifiers;
 
 /**
  * Unit tests for AbortTransaction.
@@ -23,35 +24,21 @@ public class AbortTransactionTest {
 
     @Test
     public void testSerialization() {
-        AbortTransaction expected = new AbortTransaction("txId", DataStoreVersions.CURRENT_VERSION);
+        AbortTransaction expected = new AbortTransaction(
+            MockIdentifiers.transactionIdentifier(AbortTransactionTest.class, "mock"),
+            DataStoreVersions.CURRENT_VERSION);
 
         Object serialized = expected.toSerializable();
         assertEquals("Serialized type", AbortTransaction.class, serialized.getClass());
 
         AbortTransaction actual = AbortTransaction.fromSerializable(
                 SerializationUtils.clone((Serializable) serialized));
-        assertEquals("getTransactionID", expected.getTransactionID(), actual.getTransactionID());
+        assertEquals("getTransactionID", expected.getTransactionId(), actual.getTransactionId());
         assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, actual.getVersion());
     }
 
-    @Test
-    public void testSerializationWithPreBoronVersion() {
-        AbortTransaction expected = new AbortTransaction("txId", DataStoreVersions.LITHIUM_VERSION);
-
-        Object serialized = expected.toSerializable();
-        assertEquals("Serialized type", ThreePhaseCommitCohortMessages.AbortTransaction.class, serialized.getClass());
-
-        AbortTransaction actual = AbortTransaction.fromSerializable(
-                SerializationUtils.clone((Serializable) serialized));
-        assertEquals("getTransactionID", expected.getTransactionID(), actual.getTransactionID());
-        assertEquals("getVersion", DataStoreVersions.LITHIUM_VERSION, actual.getVersion());
-    }
-
     @Test
     public void testIsSerializedType() {
-        assertEquals("isSerializedType", true, AbortTransaction.isSerializedType(
-                ThreePhaseCommitCohortMessages.AbortTransaction.newBuilder().setTransactionId("").build()));
-
         assertEquals("isSerializedType", true, AbortTransaction.isSerializedType(new AbortTransaction()));
         assertEquals("isSerializedType", false, AbortTransaction.isSerializedType(new Object()));
     }