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%2FShardTransactionTest.java;h=851fb0114b3a64c7d211a5c6375c14c41e715e69;hb=20156b149d56b1b14a06d344366b8e1af1c22fe8;hp=711f3d7a72a16b615224246e07e3adb750b7cff6;hpb=8600573a11d7a0fa1c03e6c3f014473096e6a97c;p=controller.git 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 711f3d7a72..851fb0114b 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 @@ -1,13 +1,18 @@ package org.opendaylight.controller.cluster.datastore; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import akka.actor.ActorRef; import akka.actor.Props; import akka.actor.Terminated; import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; -import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import org.junit.BeforeClass; +import java.util.Collections; +import java.util.concurrent.TimeUnit; +import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.ShardWriteTransaction.GetCompositeModificationReply; import org.opendaylight.controller.cluster.datastore.exceptions.UnknownMessageException; @@ -15,6 +20,7 @@ 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.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; @@ -32,26 +38,21 @@ import org.opendaylight.controller.cluster.datastore.modification.DeleteModifica import org.opendaylight.controller.cluster.datastore.modification.MergeModification; 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.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.model.api.SchemaContext; import scala.concurrent.duration.Duration; -import java.util.Collections; -import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; public class ShardTransactionTest extends AbstractActorTest { - private static ListeningExecutorService storeExecutor = - MoreExecutors.listeningDecorator(MoreExecutors.sameThreadExecutor()); - - private static final InMemoryDOMDataStore store = - new InMemoryDOMDataStore("OPER", storeExecutor, MoreExecutors.sameThreadExecutor()); private static final SchemaContext testSchemaContext = TestModel.createTestContext(); @@ -63,45 +64,60 @@ 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); } private ActorRef createShard(){ return getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, - Collections.EMPTY_MAP, datastoreContext, TestModel.createTestContext())); + 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"); - testOnReceiveReadData(getSystem().actorOf(props, "testReadDataRO")); + testOnReceiveReadData(newTransactionActor(store.newReadOnlyTransaction(), shard, "testReadDataRO")); - props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - - testOnReceiveReadData(getSystem().actorOf(props, "testReadDataRW")); + testOnReceiveReadData(newTransactionActor(store.newReadWriteTransaction(), shard, "testReadDataRW")); } - private void testOnReceiveReadData(final ActorRef subject) { + private void testOnReceiveReadData(final ActorRef transaction) { //serialized read - subject.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), + transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), getRef()); - ShardTransactionMessages.ReadDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); + Object replySerialized = + expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - assertNotNull(ReadDataReply.fromSerializable( - testSchemaContext,YangInstanceIdentifier.builder().build(), replySerialized) - .getNormalizedNode()); + assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); // unserialized read - subject.tell(new ReadData(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()),getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -113,31 +129,25 @@ 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"); - - testOnReceiveReadDataWhenDataNotFound(getSystem().actorOf( - props, "testReadDataWhenDataNotFoundRO")); - props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testOnReceiveReadDataWhenDataNotFound(newTransactionActor( + store.newReadOnlyTransaction(), shard, "testReadDataWhenDataNotFoundRO")); - testOnReceiveReadDataWhenDataNotFound(getSystem().actorOf( - props, "testReadDataWhenDataNotFoundRW")); + testOnReceiveReadDataWhenDataNotFound(newTransactionActor( + store.newReadWriteTransaction(), shard, "testReadDataWhenDataNotFoundRW")); } - private void testOnReceiveReadDataWhenDataNotFound(final ActorRef subject) { + private void testOnReceiveReadDataWhenDataNotFound(final ActorRef transaction) { // serialized read - subject.tell(new ReadData(TestModel.TEST_PATH).toSerializable(), getRef()); + transaction.tell(new ReadData(TestModel.TEST_PATH).toSerializable(), getRef()); - ShardTransactionMessages.ReadDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); + Object replySerialized = + expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - assertTrue(ReadDataReply.fromSerializable( - testSchemaContext, TestModel.TEST_PATH, replySerialized).getNormalizedNode() == null); + assertTrue(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode() == null); // unserialized read - subject.tell(new ReadData(TestModel.TEST_PATH),getRef()); + transaction.tell(new ReadData(TestModel.TEST_PATH),getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -145,23 +155,36 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } + @Test + public void testOnReceiveReadDataHeliumR1() throws Exception { + new JavaTestKit(getSystem()) {{ + ActorRef transaction = newTransactionActor(store.newReadOnlyTransaction(), + "testOnReceiveReadDataHeliumR1", DataStoreVersions.HELIUM_1_VERSION); + + transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), + getRef()); + + ShardTransactionMessages.ReadDataReply replySerialized = + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.ReadDataReply.class); + + assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); + }}; + } + @Test public void testOnReceiveDataExistsPositive() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); - Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - testOnReceiveDataExistsPositive(getSystem().actorOf(props, "testDataExistsPositiveRO")); + testOnReceiveDataExistsPositive(newTransactionActor(store.newReadOnlyTransaction(), shard, + "testDataExistsPositiveRO")); - props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - - testOnReceiveDataExistsPositive(getSystem().actorOf(props, "testDataExistsPositiveRW")); + testOnReceiveDataExistsPositive(newTransactionActor(store.newReadWriteTransaction(), shard, + "testDataExistsPositiveRW")); } - private void testOnReceiveDataExistsPositive(final ActorRef subject) { - subject.tell(new DataExists(YangInstanceIdentifier.builder().build()).toSerializable(), + private void testOnReceiveDataExistsPositive(final ActorRef transaction) { + transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()).toSerializable(), getRef()); ShardTransactionMessages.DataExistsReply replySerialized = @@ -170,7 +193,7 @@ public class ShardTransactionTest extends AbstractActorTest { assertTrue(DataExistsReply.fromSerializable(replySerialized).exists()); // unserialized read - subject.tell(new DataExists(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()),getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -182,19 +205,16 @@ 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"); - - testOnReceiveDataExistsNegative(getSystem().actorOf(props, "testDataExistsNegativeRO")); - props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testOnReceiveDataExistsNegative(newTransactionActor(store.newReadOnlyTransaction(), shard, + "testDataExistsNegativeRO")); - testOnReceiveDataExistsNegative(getSystem().actorOf(props, "testDataExistsNegativeRW")); + testOnReceiveDataExistsNegative(newTransactionActor(store.newReadWriteTransaction(), shard, + "testDataExistsNegativeRW")); } - private void testOnReceiveDataExistsNegative(final ActorRef subject) { - subject.tell(new DataExists(TestModel.TEST_PATH).toSerializable(), getRef()); + private void testOnReceiveDataExistsNegative(final ActorRef transaction) { + transaction.tell(new DataExists(TestModel.TEST_PATH).toSerializable(), getRef()); ShardTransactionMessages.DataExistsReply replySerialized = expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DataExistsReply.class); @@ -202,7 +222,7 @@ public class ShardTransactionTest extends AbstractActorTest { assertFalse(DataExistsReply.fromSerializable(replySerialized).exists()); // unserialized read - subject.tell(new DataExists(TestModel.TEST_PATH),getRef()); + transaction.tell(new DataExists(TestModel.TEST_PATH),getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -226,76 +246,104 @@ 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"); - final ActorRef subject = - getSystem().actorOf(props, "testWriteData"); + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testOnReceiveWriteData"); - subject.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), TestModel.createTestContext()).toSerializable(), - getRef()); + transaction.tell(new WriteData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)).toSerializable( + DataStoreVersions.HELIUM_2_VERSION), getRef()); - ShardTransactionMessages.WriteDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); - assertModification(subject, WriteModification.class); + assertModification(transaction, WriteModification.class); - //unserialized write - subject.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), - TestModel.createTestContext()), + // unserialized write + transaction.tell(new WriteData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)), getRef()); expectMsgClass(duration("5 seconds"), WriteDataReply.class); }}; } + @Test + public void testOnReceiveHeliumR1WriteData() throws Exception { + new JavaTestKit(getSystem()) {{ + 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)); + ShardTransactionMessages.WriteData serialized = ShardTransactionMessages.WriteData.newBuilder() + .setInstanceIdentifierPathArguments(encoded.getEncodedPath()) + .setNormalizedNode(encoded.getEncodedNode().getNormalizedNode()).build(); + + transaction.tell(serialized, getRef()); + + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); + + assertModification(transaction, WriteModification.class); + }}; + } + @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"); - final ActorRef subject = - getSystem().actorOf(props, "testMergeData"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testMergeData"); - subject.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), testSchemaContext).toSerializable(), - getRef()); + transaction.tell(new MergeData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)).toSerializable( + DataStoreVersions.HELIUM_2_VERSION), getRef()); - ShardTransactionMessages.MergeDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); - assertModification(subject, MergeModification.class); + assertModification(transaction, MergeModification.class); //unserialized merge - subject.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), testSchemaContext), + transaction.tell(new MergeData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)), getRef()); expectMsgClass(duration("5 seconds"), MergeDataReply.class); }}; } + @Test + public void testOnReceiveHeliumR1MergeData() throws Exception { + new JavaTestKit(getSystem()) {{ + 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)); + ShardTransactionMessages.MergeData serialized = ShardTransactionMessages.MergeData.newBuilder() + .setInstanceIdentifierPathArguments(encoded.getEncodedPath()) + .setNormalizedNode(encoded.getEncodedNode().getNormalizedNode()).build(); + + transaction.tell(serialized, getRef()); + + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); + + assertModification(transaction, MergeModification.class); + }}; + } + @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"); - final ActorRef subject = - getSystem().actorOf(props, "testDeleteData"); + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testDeleteData"); - subject.tell(new DeleteData(TestModel.TEST_PATH).toSerializable(), getRef()); + transaction.tell(new DeleteData(TestModel.TEST_PATH).toSerializable( + DataStoreVersions.HELIUM_2_VERSION), getRef()); - ShardTransactionMessages.DeleteDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DeleteDataReply.class); + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DeleteDataReply.class); - assertModification(subject, DeleteModification.class); + assertModification(transaction, DeleteModification.class); - //unserialized merge - subject.tell(new DeleteData(TestModel.TEST_PATH), getRef()); + //unserialized + transaction.tell(new DeleteData(TestModel.TEST_PATH), getRef()); expectMsgClass(duration("5 seconds"), DeleteDataReply.class); }}; @@ -305,46 +353,104 @@ public class ShardTransactionTest extends AbstractActorTest { @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"); - final ActorRef subject = - getSystem().actorOf(props, "testReadyTransaction"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testReadyTransaction"); + + watch(transaction); - subject.tell(new ReadyTransaction().toSerializable(), getRef()); + transaction.tell(new ReadyTransaction().toSerializable(), getRef()); - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS); + expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS, + Terminated.class); + expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS, + Terminated.class); }}; // test new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = - getSystem().actorOf(props, "testReadyTransaction2"); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testReadyTransaction2"); + + watch(transaction); + + transaction.tell(new ReadyTransaction(), getRef()); + + expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.class, + Terminated.class); + 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); - subject.tell(new ReadyTransaction(), getRef()); + transaction.tell(CreateSnapshot.INSTANCE, getRef()); - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.class); + 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); }}; + } + @Test + public void testReadWriteTxOnReceiveCloseTransaction() throws Exception { + new JavaTestKit(getSystem()) {{ + 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); + }}; } - @SuppressWarnings("unchecked") @Test - public void testOnReceiveCloseTransaction() throws Exception { + public void testWriteOnlyTxOnReceiveCloseTransaction() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = getSystem().actorOf(props, "testCloseTransaction"); + final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + "testWriteTxOnReceiveCloseTransaction"); - watch(subject); + watch(transaction); - subject.tell(new CloseTransaction().toSerializable(), getRef()); + transaction.tell(new CloseTransaction().toSerializable(), getRef()); expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectTerminated(duration("3 seconds"), transaction); + }}; + } + + @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); }}; } @@ -353,10 +459,12 @@ public class ShardTransactionTest extends AbstractActorTest { public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception { final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final TestActorRef subject = TestActorRef.apply(props,getSystem()); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final TestActorRef transaction = TestActorRef.apply(props,getSystem()); - subject.receive(new DeleteData(TestModel.TEST_PATH).toSerializable(), ActorRef.noSender()); + transaction.receive(new DeleteData(TestModel.TEST_PATH).toSerializable( + DataStoreVersions.CURRENT_VERSION), ActorRef.noSender()); } @Test @@ -366,29 +474,12 @@ public class ShardTransactionTest extends AbstractActorTest { Duration.create(500, TimeUnit.MILLISECONDS)).build(); new JavaTestKit(getSystem()) {{ - final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = - getSystem().actorOf(props, "testShardTransactionInactivity"); - - watch(subject); - - // The shard Tx actor should receive a ReceiveTimeout message and self-destruct. - - final String termination = new ExpectMsg(duration("3 seconds"), "match hint") { - // do not put code outside this method, will run afterwards - @Override - protected String match(Object in) { - if (in instanceof Terminated) { - return "match"; - } else { - throw noMatch(); - } - } - }.get(); // this extracts the received message - - assertEquals("match", termination); + final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + "testShardTransactionInactivity"); + + watch(transaction); + + expectMsgClass(duration("3 seconds"), Terminated.class); }}; } }