BUG-5280: switch transaction IDs from String to TransactionIdentifier

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
index a02220d7b5f176092abbea3f169fce72c8500749..0cb9046a65289fee6bcbb850acc47ab5f7b63fff 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
@@ -24,7 +24,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
-import org.opendaylight.controller.cluster.access.concepts.MemberName;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.exceptions.UnknownMessageException;
 import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
 import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
@@ -62,7 +62,8 @@ public class ShardTransactionTest extends AbstractActorTest {
     private static final TransactionType WO = TransactionType.WRITE_ONLY;
 
     private static final ShardIdentifier SHARD_IDENTIFIER =
-        ShardIdentifier.create("inventory", MemberName.forName("member-1"), "config");
+        ShardIdentifier.create("inventory", MEMBER_NAME, "config");
+
 
     private DatastoreContext datastoreContext = DatastoreContext.newBuilder().build();
 
@@ -70,8 +71,6 @@ public class ShardTransactionTest extends AbstractActorTest {
 
     private final ShardDataTree store = new ShardDataTree(testSchemaContext, TreeType.OPERATIONAL);
 
-    private int txCounter = 0;
-
     private ActorRef createShard() {
         ActorRef shard = getSystem().actorOf(Shard.builder().id(SHARD_IDENTIFIER).datastoreContext(datastoreContext).
                 schemaContext(TestModel.createTestContext()).props());
@@ -90,11 +89,11 @@ public class ShardTransactionTest extends AbstractActorTest {
     }
 
     private ReadOnlyShardDataTreeTransaction readOnlyTransaction() {
-        return store.newReadOnlyTransaction("test-ro-" + String.valueOf(txCounter++), null);
+        return store.newReadOnlyTransaction(nextTransactionId());
     }
 
     private ReadWriteShardDataTreeTransaction readWriteTransaction() {
-        return store.newReadWriteTransaction("test-rw-" + String.valueOf(txCounter++), null);
+        return store.newReadWriteTransaction(nextTransactionId());
     }
 
     @Test
@@ -187,7 +186,8 @@ public class ShardTransactionTest extends AbstractActorTest {
 
             ShardDataTreeTransactionParent parent = Mockito.mock(ShardDataTreeTransactionParent.class);
             DataTreeModification mockModification = Mockito.mock(DataTreeModification.class);
-            ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, "id", mockModification);
+            ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent,
+                nextTransactionId(), mockModification);
             final ActorRef transaction = newTransactionActor(RW, mockWriteTx, "testOnReceiveBatchedModifications");
 
             YangInstanceIdentifier writePath = TestModel.TEST_PATH;
@@ -201,7 +201,7 @@ public class ShardTransactionTest extends AbstractActorTest {
 
             YangInstanceIdentifier deletePath = TestModel.TEST_PATH;
 
-            BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null);
+            BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION);
             batched.addModification(new WriteModification(writePath, writeData));
             batched.addModification(new MergeModification(mergePath, mergeData));
             batched.addModification(new DeleteModification(deletePath));
@@ -233,14 +233,15 @@ public class ShardTransactionTest extends AbstractActorTest {
                     new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).
                     withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
 
-            BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null);
+            final TransactionIdentifier tx1 = nextTransactionId();
+            BatchedModifications batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION);
             batched.addModification(new WriteModification(writePath, writeData));
 
             transaction.tell(batched, getRef());
             BatchedModificationsReply reply = expectMsgClass(duration("5 seconds"), BatchedModificationsReply.class);
             assertEquals("getNumBatched", 1, reply.getNumBatched());
 
-            batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null);
+            batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION);
             batched.setReady(true);
             batched.setTotalMessagesSent(2);
 
@@ -265,7 +266,7 @@ public class ShardTransactionTest extends AbstractActorTest {
                     new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).
                     withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
 
-            BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null);
+            BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION);
             batched.addModification(new WriteModification(writePath, writeData));
             batched.setReady(true);
             batched.setDoCommitOnReady(true);
@@ -283,7 +284,8 @@ public class ShardTransactionTest extends AbstractActorTest {
 
             ShardDataTreeTransactionParent parent = Mockito.mock(ShardDataTreeTransactionParent.class);
             DataTreeModification mockModification = Mockito.mock(DataTreeModification.class);
-            ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, "id", mockModification);
+            ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent,
+                nextTransactionId(), mockModification);
             final ActorRef transaction = newTransactionActor(RW, mockWriteTx,
                     "testOnReceiveBatchedModificationsFailure");
 
@@ -295,13 +297,14 @@ public class ShardTransactionTest extends AbstractActorTest {
 
             doThrow(new TestException()).when(mockModification).write(path, node);
 
-            BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null);
+            final TransactionIdentifier tx1 = nextTransactionId();
+            BatchedModifications batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION);
             batched.addModification(new WriteModification(path, node));
 
             transaction.tell(batched, getRef());
             expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class);
 
-            batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null);
+            batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION);
             batched.setReady(true);
             batched.setTotalMessagesSent(2);
 
@@ -325,7 +328,7 @@ public class ShardTransactionTest extends AbstractActorTest {
             JavaTestKit watcher = new JavaTestKit(getSystem());
             watcher.watch(transaction);
 
-            BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null);
+            BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION);
             batched.setReady(true);
             batched.setTotalMessagesSent(2);
 
@@ -422,7 +425,7 @@ public class ShardTransactionTest extends AbstractActorTest {
                 datastoreContext, shardStats);
         final TestActorRef<ShardTransaction> transaction = TestActorRef.apply(props,getSystem());
 
-        transaction.receive(new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null),
+        transaction.receive(new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION),
                 ActorRef.noSender());
     }