X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardTransactionTest.java;h=c6b5cb44026f42690fffc89289a50c13fe1c59aa;hp=79480ce5926dbce0be66580eb602ed8592c30bc0;hb=3927509ec3ecfa32a51b725d2b7155d425f5b877;hpb=3f153e5fa694fe4147e72e615edbb5c263e5a394 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 79480ce592..c6b5cb4402 100644 --- 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 @@ -12,14 +12,19 @@ import akka.testkit.TestActorRef; import com.google.common.util.concurrent.MoreExecutors; import java.util.Collections; import java.util.concurrent.TimeUnit; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; +import org.mockito.InOrder; +import org.mockito.Mockito; import org.opendaylight.controller.cluster.datastore.ShardWriteTransaction.GetCompositeModificationReply; 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; +import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications; +import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply; import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction; import org.opendaylight.controller.cluster.datastore.messages.CloseTransactionReply; +import org.opendaylight.controller.cluster.datastore.messages.CreateSnapshot; import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.DataExistsReply; import org.opendaylight.controller.cluster.datastore.messages.DeleteData; @@ -39,17 +44,20 @@ import org.opendaylight.controller.cluster.datastore.modification.Modification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec; import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec.Encoded; +import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils; +import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshotReply; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransaction; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; 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; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import scala.concurrent.duration.Duration; public class ShardTransactionTest extends AbstractActorTest { - private static final InMemoryDOMDataStore store = - new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); private static final SchemaContext testSchemaContext = TestModel.createTestContext(); @@ -61,8 +69,11 @@ public class ShardTransactionTest extends AbstractActorTest { private final ShardStats shardStats = new ShardStats(SHARD_IDENTIFIER.toString(), "DataStore"); - @BeforeClass - public static void staticSetup() { + private final InMemoryDOMDataStore store = + new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); + + @Before + public void setup() { store.onGlobalContextUpdated(testSchemaContext); } @@ -71,21 +82,33 @@ public class ShardTransactionTest extends AbstractActorTest { Collections.emptyMap(), datastoreContext, TestModel.createTestContext())); } + private ActorRef newTransactionActor(DOMStoreTransaction transaction, String name) { + return newTransactionActor(transaction, name, DataStoreVersions.CURRENT_VERSION); + } + + private ActorRef newTransactionActor(DOMStoreTransaction transaction, String name, short version) { + return newTransactionActor(transaction, null, name, version); + } + + private ActorRef newTransactionActor(DOMStoreTransaction transaction, ActorRef shard, String name) { + return newTransactionActor(transaction, null, name, DataStoreVersions.CURRENT_VERSION); + } + + private ActorRef newTransactionActor(DOMStoreTransaction transaction, ActorRef shard, String name, + short version) { + Props props = ShardTransaction.props(transaction, shard != null ? shard : createShard(), + testSchemaContext, datastoreContext, shardStats, "txn", version); + return getSystem().actorOf(props, name); + } + @Test public void testOnReceiveReadData() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); - Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - testOnReceiveReadData(getSystem().actorOf(props, "testReadDataRO")); + testOnReceiveReadData(newTransactionActor(store.newReadOnlyTransaction(), shard, "testReadDataRO")); - props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - - testOnReceiveReadData(getSystem().actorOf(props, "testReadDataRW")); + testOnReceiveReadData(newTransactionActor(store.newReadWriteTransaction(), shard, "testReadDataRW")); } private void testOnReceiveReadData(final ActorRef transaction) { @@ -111,19 +134,12 @@ public class ShardTransactionTest extends AbstractActorTest { public void testOnReceiveReadDataWhenDataNotFound() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); - Props props = ShardTransaction.props( store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - - testOnReceiveReadDataWhenDataNotFound(getSystem().actorOf( - props, "testReadDataWhenDataNotFoundRO")); - props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); + testOnReceiveReadDataWhenDataNotFound(newTransactionActor( + store.newReadOnlyTransaction(), shard, "testReadDataWhenDataNotFoundRO")); - testOnReceiveReadDataWhenDataNotFound(getSystem().actorOf( - props, "testReadDataWhenDataNotFoundRW")); + testOnReceiveReadDataWhenDataNotFound(newTransactionActor( + store.newReadWriteTransaction(), shard, "testReadDataWhenDataNotFoundRW")); } private void testOnReceiveReadDataWhenDataNotFound(final ActorRef transaction) { @@ -147,12 +163,8 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testOnReceiveReadDataHeliumR1() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.HELIUM_1_VERSION); - - ActorRef transaction = getSystem().actorOf(props, "testOnReceiveReadDataHeliumR1"); + ActorRef transaction = newTransactionActor(store.newReadOnlyTransaction(), + "testOnReceiveReadDataHeliumR1", DataStoreVersions.HELIUM_1_VERSION); transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), getRef()); @@ -168,17 +180,12 @@ public class ShardTransactionTest extends AbstractActorTest { public void testOnReceiveDataExistsPositive() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); - Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - - testOnReceiveDataExistsPositive(getSystem().actorOf(props, "testDataExistsPositiveRO")); - props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); + testOnReceiveDataExistsPositive(newTransactionActor(store.newReadOnlyTransaction(), shard, + "testDataExistsPositiveRO")); - testOnReceiveDataExistsPositive(getSystem().actorOf(props, "testDataExistsPositiveRW")); + testOnReceiveDataExistsPositive(newTransactionActor(store.newReadWriteTransaction(), shard, + "testDataExistsPositiveRW")); } private void testOnReceiveDataExistsPositive(final ActorRef transaction) { @@ -203,17 +210,12 @@ public class ShardTransactionTest extends AbstractActorTest { public void testOnReceiveDataExistsNegative() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); - Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - testOnReceiveDataExistsNegative(getSystem().actorOf(props, "testDataExistsNegativeRO")); + testOnReceiveDataExistsNegative(newTransactionActor(store.newReadOnlyTransaction(), shard, + "testDataExistsNegativeRO")); - props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - - testOnReceiveDataExistsNegative(getSystem().actorOf(props, "testDataExistsNegativeRW")); + testOnReceiveDataExistsNegative(newTransactionActor(store.newReadWriteTransaction(), shard, + "testDataExistsNegativeRW")); } private void testOnReceiveDataExistsNegative(final ActorRef transaction) { @@ -249,15 +251,12 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testOnReceiveWriteData() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testOnReceiveWriteData"); + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testOnReceiveWriteData"); transaction.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME)).toSerializable( - DataStoreVersions.HELIUM_2_VERSION), getRef()); + ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.HELIUM_2_VERSION). + toSerializable(), getRef()); expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); @@ -265,7 +264,7 @@ public class ShardTransactionTest extends AbstractActorTest { // unserialized write transaction.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME)), + ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.CURRENT_VERSION), getRef()); expectMsgClass(duration("5 seconds"), WriteDataReply.class); @@ -275,11 +274,8 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testOnReceiveHeliumR1WriteData() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.HELIUM_1_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testOnReceiveHeliumR1WriteData"); + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testOnReceiveHeliumR1WriteData", DataStoreVersions.HELIUM_1_VERSION); Encoded encoded = new NormalizedNodeToNodeCodec(null).encode(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); @@ -298,15 +294,12 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testOnReceiveMergeData() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testMergeData"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testMergeData"); transaction.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME)).toSerializable( - DataStoreVersions.HELIUM_2_VERSION), getRef()); + ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.HELIUM_2_VERSION). + toSerializable(), getRef()); expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); @@ -314,7 +307,7 @@ public class ShardTransactionTest extends AbstractActorTest { //unserialized merge transaction.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME)), + ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.CURRENT_VERSION), getRef()); expectMsgClass(duration("5 seconds"), MergeDataReply.class); @@ -324,11 +317,8 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testOnReceiveHeliumR1MergeData() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.HELIUM_1_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testOnReceiveHeliumR1MergeData"); + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testOnReceiveHeliumR1MergeData", DataStoreVersions.HELIUM_1_VERSION); Encoded encoded = new NormalizedNodeToNodeCodec(null).encode(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); @@ -347,34 +337,82 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testOnReceiveDeleteData() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props( store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testDeleteData"); + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testDeleteData"); - transaction.tell(new DeleteData(TestModel.TEST_PATH).toSerializable(), getRef()); + transaction.tell(new DeleteData(TestModel.TEST_PATH, DataStoreVersions.HELIUM_2_VERSION). + toSerializable(), getRef()); expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DeleteDataReply.class); assertModification(transaction, DeleteModification.class); - //unserialized merge - transaction.tell(new DeleteData(TestModel.TEST_PATH), getRef()); + //unserialized + transaction.tell(new DeleteData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION), getRef()); expectMsgClass(duration("5 seconds"), DeleteDataReply.class); }}; } + @Test + public void testOnReceiveBatchedModifications() throws Exception { + new JavaTestKit(getSystem()) {{ + + DOMStoreWriteTransaction mockWriteTx = Mockito.mock(DOMStoreWriteTransaction.class); + final ActorRef transaction = newTransactionActor(mockWriteTx, "testOnReceiveBatchedModifications"); + + YangInstanceIdentifier writePath = TestModel.TEST_PATH; + NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( + new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). + withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); + + YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH; + NormalizedNode mergeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( + new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)).build(); + + YangInstanceIdentifier deletePath = TestModel.TEST_PATH; + + BatchedModifications batched = new BatchedModifications(DataStoreVersions.CURRENT_VERSION); + batched.addModification(new WriteModification(writePath, writeData)); + batched.addModification(new MergeModification(mergePath, mergeData)); + batched.addModification(new DeleteModification(deletePath)); + + transaction.tell(batched, getRef()); + + BatchedModificationsReply reply = expectMsgClass(duration("5 seconds"), BatchedModificationsReply.class); + assertEquals("getNumBatched", 3, reply.getNumBatched()); + + JavaTestKit verification = new JavaTestKit(getSystem()); + transaction.tell(new ShardWriteTransaction.GetCompositedModification(), verification.getRef()); + + CompositeModification compositeModification = verification.expectMsgClass(duration("5 seconds"), + GetCompositeModificationReply.class).getModification(); + + assertEquals("CompositeModification size", 3, compositeModification.getModifications().size()); + + WriteModification write = (WriteModification)compositeModification.getModifications().get(0); + assertEquals("getPath", writePath, write.getPath()); + assertEquals("getData", writeData, write.getData()); + + MergeModification merge = (MergeModification)compositeModification.getModifications().get(1); + assertEquals("getPath", mergePath, merge.getPath()); + assertEquals("getData", mergeData, merge.getData()); + + DeleteModification delete = (DeleteModification)compositeModification.getModifications().get(2); + assertEquals("getPath", deletePath, delete.getPath()); + + InOrder inOrder = Mockito.inOrder(mockWriteTx); + inOrder.verify(mockWriteTx).write(writePath, writeData); + inOrder.verify(mockWriteTx).merge(mergePath, mergeData); + inOrder.verify(mockWriteTx).delete(deletePath); + }}; + } @Test public void testOnReceiveReadyTransaction() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testReadyTransaction"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testReadyTransaction"); watch(transaction); @@ -388,11 +426,8 @@ public class ShardTransactionTest extends AbstractActorTest { // test new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testReadyTransaction2"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testReadyTransaction2"); watch(transaction); @@ -403,18 +438,57 @@ public class ShardTransactionTest extends AbstractActorTest { expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.class, Terminated.class); }}; + } + + @Test + public void testOnReceiveCreateSnapshot() throws Exception { + new JavaTestKit(getSystem()) {{ + ShardTest.writeToStore(store, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + + NormalizedNode expectedRoot = ShardTest.readStore(store, + YangInstanceIdentifier.builder().build()); + + final ActorRef transaction = newTransactionActor(store.newReadOnlyTransaction(), + "testOnReceiveCreateSnapshot"); + + watch(transaction); + + transaction.tell(CreateSnapshot.INSTANCE, getRef()); + CaptureSnapshotReply reply = expectMsgClass(duration("3 seconds"), CaptureSnapshotReply.class); + + assertNotNull("getSnapshot is null", reply.getSnapshot()); + + NormalizedNode actualRoot = SerializationUtils.deserializeNormalizedNode( + reply.getSnapshot()); + + assertEquals("Root node", expectedRoot, actualRoot); + + expectTerminated(duration("3 seconds"), transaction); + }}; } - @SuppressWarnings("unchecked") @Test - public void testOnReceiveCloseTransaction() throws Exception { + public void testReadWriteTxOnReceiveCloseTransaction() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - final ActorRef transaction = getSystem().actorOf(props, "testCloseTransaction"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testReadWriteTxOnReceiveCloseTransaction"); + + watch(transaction); + + transaction.tell(new CloseTransaction().toSerializable(), getRef()); + + expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectTerminated(duration("3 seconds"), transaction); + }}; + } + + @Test + public void testWriteOnlyTxOnReceiveCloseTransaction() throws Exception { + new JavaTestKit(getSystem()) {{ + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testWriteTxOnReceiveCloseTransaction"); watch(transaction); @@ -425,6 +499,20 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } + @Test + public void testReadOnlyTxOnReceiveCloseTransaction() throws Exception { + new JavaTestKit(getSystem()) {{ + final ActorRef transaction = newTransactionActor(store.newReadOnlyTransaction(), + "testReadOnlyTxOnReceiveCloseTransaction"); + + watch(transaction); + + transaction.tell(new CloseTransaction().toSerializable(), getRef()); + + expectMsgClass(duration("3 seconds"), Terminated.class); + }}; + } + @Test(expected=UnknownMessageException.class) public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception { final ActorRef shard = createShard(); @@ -433,22 +521,19 @@ public class ShardTransactionTest extends AbstractActorTest { DataStoreVersions.CURRENT_VERSION); final TestActorRef transaction = TestActorRef.apply(props,getSystem()); - transaction.receive(new DeleteData(TestModel.TEST_PATH).toSerializable(), ActorRef.noSender()); + transaction.receive(new DeleteData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION). + toSerializable(), ActorRef.noSender()); } @Test public void testShardTransactionInactivity() { datastoreContext = DatastoreContext.newBuilder().shardTransactionIdleTimeout( - Duration.create(500, TimeUnit.MILLISECONDS)).build(); + 500, TimeUnit.MILLISECONDS).build(); new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn", - DataStoreVersions.CURRENT_VERSION); - final ActorRef transaction = - getSystem().actorOf(props, "testShardTransactionInactivity"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testShardTransactionInactivity"); watch(transaction);