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=e0b34925ab6116708e7b1f257ca959b815d0079e;hp=c9335f378a8662e7b7ceb488961fb49588d50baf;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hpb=68fb550b416dddd0a50e0110add0a4ae9b706758 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 c9335f378a..e0b34925ab 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,3 +1,11 @@ +/* + * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; @@ -11,14 +19,11 @@ import akka.actor.Status.Failure; import akka.actor.Terminated; import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; -import com.google.common.util.concurrent.MoreExecutors; -import java.util.Collections; import java.util.concurrent.TimeUnit; -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.access.concepts.MemberName; 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; @@ -26,36 +31,25 @@ import org.opendaylight.controller.cluster.datastore.messages.BatchedModificatio 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.CommitTransactionReply; 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; -import org.opendaylight.controller.cluster.datastore.messages.DeleteDataReply; -import org.opendaylight.controller.cluster.datastore.messages.MergeData; -import org.opendaylight.controller.cluster.datastore.messages.MergeDataReply; import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply; -import org.opendaylight.controller.cluster.datastore.messages.ReadyTransaction; import org.opendaylight.controller.cluster.datastore.messages.ReadyTransactionReply; -import org.opendaylight.controller.cluster.datastore.messages.WriteData; -import org.opendaylight.controller.cluster.datastore.messages.WriteDataReply; -import org.opendaylight.controller.cluster.datastore.modification.CompositeModification; import org.opendaylight.controller.cluster.datastore.modification.DeleteModification; 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.controller.sal.core.spi.data.DOMStoreWriteTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; +import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; 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; @@ -63,45 +57,44 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class ShardTransactionTest extends AbstractActorTest { private static final SchemaContext testSchemaContext = TestModel.createTestContext(); + private static final TransactionType RO = TransactionType.READ_ONLY; + private static final TransactionType RW = TransactionType.READ_WRITE; + private static final TransactionType WO = TransactionType.WRITE_ONLY; private static final ShardIdentifier SHARD_IDENTIFIER = - ShardIdentifier.builder().memberName("member-1") - .shardName("inventory").type("config").build(); + ShardIdentifier.create("inventory", MemberName.forName("member-1"), "config"); private DatastoreContext datastoreContext = DatastoreContext.newBuilder().build(); private final ShardStats shardStats = new ShardStats(SHARD_IDENTIFIER.toString(), "DataStore"); - private final InMemoryDOMDataStore store = - new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); + private final ShardDataTree store = new ShardDataTree(testSchemaContext, TreeType.OPERATIONAL); - @Before - public void setup() { - store.onGlobalContextUpdated(testSchemaContext); - } + private int txCounter = 0; - private ActorRef createShard(){ - return getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, - Collections.emptyMap(), datastoreContext, TestModel.createTestContext())); + private ActorRef createShard() { + ActorRef shard = getSystem().actorOf(Shard.builder().id(SHARD_IDENTIFIER).datastoreContext(datastoreContext). + schemaContext(TestModel.createTestContext()).props()); + ShardTestKit.waitUntilLeader(shard); + return shard; } - private ActorRef newTransactionActor(DOMStoreTransaction transaction, String name) { - return newTransactionActor(transaction, name, DataStoreVersions.CURRENT_VERSION); + private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction transaction, String name) { + return newTransactionActor(type, transaction, null, name); } - private ActorRef newTransactionActor(DOMStoreTransaction transaction, String name, short version) { - return newTransactionActor(transaction, null, name, version); + private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shard, String name) { + Props props = ShardTransaction.props(type, transaction, shard != null ? shard : createShard(), + datastoreContext, shardStats, "txn"); + return getSystem().actorOf(props, name); } - private ActorRef newTransactionActor(DOMStoreTransaction transaction, ActorRef shard, String name) { - return newTransactionActor(transaction, null, name, DataStoreVersions.CURRENT_VERSION); + private ReadOnlyShardDataTreeTransaction readOnlyTransaction() { + return store.newReadOnlyTransaction("test-ro-" + String.valueOf(txCounter++), null); } - private ActorRef newTransactionActor(DOMStoreTransaction transaction, ActorRef shard, String name, - short version) { - Props props = ShardTransaction.props(transaction, shard != null ? shard : createShard(), - datastoreContext, shardStats, "txn", version); - return getSystem().actorOf(props, name); + private ReadWriteShardDataTreeTransaction readWriteTransaction() { + return store.newReadWriteTransaction("test-rw-" + String.valueOf(txCounter++), null); } @Test @@ -109,23 +102,14 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); - testOnReceiveReadData(newTransactionActor(store.newReadOnlyTransaction(), shard, "testReadDataRO")); + testOnReceiveReadData(newTransactionActor(RO, readOnlyTransaction(), shard, "testReadDataRO")); - testOnReceiveReadData(newTransactionActor(store.newReadWriteTransaction(), shard, "testReadDataRW")); + testOnReceiveReadData(newTransactionActor(RW, readWriteTransaction(), shard, "testReadDataRW")); } private void testOnReceiveReadData(final ActorRef transaction) { - //serialized read - transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), - getRef()); - - Object replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - - assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); - - // unserialized read - transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new ReadData(YangInstanceIdentifier.EMPTY, + DataStoreVersions.CURRENT_VERSION), getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -139,23 +123,14 @@ public class ShardTransactionTest extends AbstractActorTest { final ActorRef shard = createShard(); testOnReceiveReadDataWhenDataNotFound(newTransactionActor( - store.newReadOnlyTransaction(), shard, "testReadDataWhenDataNotFoundRO")); + RO, readOnlyTransaction(), shard, "testReadDataWhenDataNotFoundRO")); testOnReceiveReadDataWhenDataNotFound(newTransactionActor( - store.newReadWriteTransaction(), shard, "testReadDataWhenDataNotFoundRW")); + RW, readWriteTransaction(), shard, "testReadDataWhenDataNotFoundRW")); } private void testOnReceiveReadDataWhenDataNotFound(final ActorRef transaction) { - // serialized read - transaction.tell(new ReadData(TestModel.TEST_PATH).toSerializable(), getRef()); - - Object replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - - assertTrue(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode() == null); - - // unserialized read - transaction.tell(new ReadData(TestModel.TEST_PATH),getRef()); + transaction.tell(new ReadData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION),getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -163,45 +138,21 @@ 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(); - testOnReceiveDataExistsPositive(newTransactionActor(store.newReadOnlyTransaction(), shard, + testOnReceiveDataExistsPositive(newTransactionActor(RO, readOnlyTransaction(), shard, "testDataExistsPositiveRO")); - testOnReceiveDataExistsPositive(newTransactionActor(store.newReadWriteTransaction(), shard, + testOnReceiveDataExistsPositive(newTransactionActor(RW, readWriteTransaction(), shard, "testDataExistsPositiveRW")); } private void testOnReceiveDataExistsPositive(final ActorRef transaction) { - transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()).toSerializable(), - getRef()); - - ShardTransactionMessages.DataExistsReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DataExistsReply.class); - - assertTrue(DataExistsReply.fromSerializable(replySerialized).exists()); - - // unserialized read - transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new DataExists(YangInstanceIdentifier.EMPTY, + DataStoreVersions.CURRENT_VERSION), getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -214,23 +165,15 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); - testOnReceiveDataExistsNegative(newTransactionActor(store.newReadOnlyTransaction(), shard, + testOnReceiveDataExistsNegative(newTransactionActor(RO, readOnlyTransaction(), shard, "testDataExistsNegativeRO")); - testOnReceiveDataExistsNegative(newTransactionActor(store.newReadWriteTransaction(), shard, + testOnReceiveDataExistsNegative(newTransactionActor(RW, readWriteTransaction(), shard, "testDataExistsNegativeRW")); } 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); - - assertFalse(DataExistsReply.fromSerializable(replySerialized).exists()); - - // unserialized read - transaction.tell(new DataExists(TestModel.TEST_PATH),getRef()); + transaction.tell(new DataExists(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION),getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -238,131 +181,14 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } - private void assertModification(final ActorRef subject, - final Class modificationType) { - new JavaTestKit(getSystem()) {{ - subject.tell(new ShardWriteTransaction.GetCompositedModification(), getRef()); - - CompositeModification compositeModification = expectMsgClass(duration("3 seconds"), - GetCompositeModificationReply.class).getModification(); - - assertTrue(compositeModification.getModifications().size() == 1); - assertEquals(modificationType, compositeModification.getModifications().get(0).getClass()); - }}; - } - - @Test - public void testOnReceiveWriteData() throws Exception { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), - "testOnReceiveWriteData"); - - transaction.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.HELIUM_2_VERSION). - toSerializable(), getRef()); - - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); - - assertModification(transaction, WriteModification.class); - - // unserialized write - transaction.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.CURRENT_VERSION), - 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 transaction = newTransactionActor(store.newReadWriteTransaction(), - "testMergeData"); - - transaction.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.HELIUM_2_VERSION). - toSerializable(), getRef()); - - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); - - assertModification(transaction, MergeModification.class); - - //unserialized merge - transaction.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), DataStoreVersions.CURRENT_VERSION), - 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 transaction = newTransactionActor(store.newWriteOnlyTransaction(), - "testDeleteData"); - - 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 - 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"); + ShardDataTreeTransactionParent parent = Mockito.mock(ShardDataTreeTransactionParent.class); + DataTreeModification mockModification = Mockito.mock(DataTreeModification.class); + ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, "id", mockModification); + final ActorRef transaction = newTransactionActor(RW, mockWriteTx, "testOnReceiveBatchedModifications"); YangInstanceIdentifier writePath = TestModel.TEST_PATH; NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( @@ -385,38 +211,19 @@ public class ShardTransactionTest extends AbstractActorTest { 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); + InOrder inOrder = Mockito.inOrder(mockModification); + inOrder.verify(mockModification).write(writePath, writeData); + inOrder.verify(mockModification).merge(mergePath, mergeData); + inOrder.verify(mockModification).delete(deletePath); }}; } @Test - public void testOnReceiveBatchedModificationsReady() throws Exception { + public void testOnReceiveBatchedModificationsReadyWithoutImmediateCommit() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), - "testOnReceiveBatchedModificationsReady"); + final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), + "testOnReceiveBatchedModificationsReadyWithoutImmediateCommit"); JavaTestKit watcher = new JavaTestKit(getSystem()); watcher.watch(transaction); @@ -443,12 +250,41 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } + @Test + public void testOnReceiveBatchedModificationsReadyWithImmediateCommit() throws Exception { + new JavaTestKit(getSystem()) {{ + + final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), + "testOnReceiveBatchedModificationsReadyWithImmediateCommit"); + + JavaTestKit watcher = new JavaTestKit(getSystem()); + watcher.watch(transaction); + + YangInstanceIdentifier writePath = TestModel.TEST_PATH; + NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( + new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). + withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build(); + + BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); + batched.addModification(new WriteModification(writePath, writeData)); + batched.setReady(true); + batched.setDoCommitOnReady(true); + batched.setTotalMessagesSent(1); + + transaction.tell(batched, getRef()); + expectMsgClass(duration("5 seconds"), CommitTransactionReply.class); + watcher.expectMsgClass(duration("5 seconds"), Terminated.class); + }}; + } + @Test(expected=TestException.class) public void testOnReceiveBatchedModificationsFailure() throws Throwable { new JavaTestKit(getSystem()) {{ - DOMStoreWriteTransaction mockWriteTx = Mockito.mock(DOMStoreWriteTransaction.class); - final ActorRef transaction = newTransactionActor(mockWriteTx, + ShardDataTreeTransactionParent parent = Mockito.mock(ShardDataTreeTransactionParent.class); + DataTreeModification mockModification = Mockito.mock(DataTreeModification.class); + ReadWriteShardDataTreeTransaction mockWriteTx = new ReadWriteShardDataTreeTransaction(parent, "id", mockModification); + final ActorRef transaction = newTransactionActor(RW, mockWriteTx, "testOnReceiveBatchedModificationsFailure"); JavaTestKit watcher = new JavaTestKit(getSystem()); @@ -457,7 +293,7 @@ public class ShardTransactionTest extends AbstractActorTest { YangInstanceIdentifier path = TestModel.TEST_PATH; ContainerNode node = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - doThrow(new TestException()).when(mockWriteTx).write(path, node); + doThrow(new TestException()).when(mockModification).write(path, node); BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null); batched.addModification(new WriteModification(path, node)); @@ -483,7 +319,7 @@ public class ShardTransactionTest extends AbstractActorTest { public void testOnReceiveBatchedModificationsReadyWithIncorrectTotalMessageCount() throws Throwable { new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), "testOnReceiveBatchedModificationsReadyWithIncorrectTotalMessageCount"); JavaTestKit watcher = new JavaTestKit(getSystem()); @@ -504,46 +340,16 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } - @Test - public void testOnReceivePreLithiumReadyTransaction() throws Exception { - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), - "testReadyTransaction", DataStoreVersions.HELIUM_2_VERSION); - - JavaTestKit watcher = new JavaTestKit(getSystem()); - watcher.watch(transaction); - - transaction.tell(new ReadyTransaction().toSerializable(), getRef()); - - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS); - watcher.expectMsgClass(duration("5 seconds"), Terminated.class); - }}; - - // test - new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), - "testReadyTransaction2", DataStoreVersions.HELIUM_2_VERSION); - - JavaTestKit watcher = new JavaTestKit(getSystem()); - watcher.watch(transaction); - - transaction.tell(new ReadyTransaction(), getRef()); - - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.class); - watcher.expectMsgClass(duration("5 seconds"), Terminated.class); - }}; - } - @Test public void testOnReceiveCreateSnapshot() throws Exception { new JavaTestKit(getSystem()) {{ - ShardTest.writeToStore(store, TestModel.TEST_PATH, + ShardTest.writeToStore(store.getDataTree(), TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - NormalizedNode expectedRoot = ShardTest.readStore(store, - YangInstanceIdentifier.builder().build()); + NormalizedNode expectedRoot = ShardTest.readStore(store.getDataTree(), + YangInstanceIdentifier.EMPTY); - final ActorRef transaction = newTransactionActor(store.newReadOnlyTransaction(), + final ActorRef transaction = newTransactionActor(TransactionType.READ_ONLY, readOnlyTransaction(), "testOnReceiveCreateSnapshot"); watch(transaction); @@ -566,14 +372,14 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testReadWriteTxOnReceiveCloseTransaction() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + final ActorRef transaction = newTransactionActor(RW, readWriteTransaction(), "testReadWriteTxOnReceiveCloseTransaction"); watch(transaction); transaction.tell(new CloseTransaction().toSerializable(), getRef()); - expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectMsgClass(duration("3 seconds"), CloseTransactionReply.class); expectTerminated(duration("3 seconds"), transaction); }}; } @@ -581,14 +387,14 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testWriteOnlyTxOnReceiveCloseTransaction() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newWriteOnlyTransaction(), + final ActorRef transaction = newTransactionActor(WO, readWriteTransaction(), "testWriteTxOnReceiveCloseTransaction"); watch(transaction); transaction.tell(new CloseTransaction().toSerializable(), getRef()); - expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectMsgClass(duration("3 seconds"), CloseTransactionReply.class); expectTerminated(duration("3 seconds"), transaction); }}; } @@ -596,7 +402,7 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testReadOnlyTxOnReceiveCloseTransaction() throws Exception { new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newReadOnlyTransaction(), + final ActorRef transaction = newTransactionActor(TransactionType.READ_ONLY, readOnlyTransaction(), "testReadOnlyTxOnReceiveCloseTransaction"); watch(transaction); @@ -610,12 +416,12 @@ public class ShardTransactionTest extends AbstractActorTest { @Test(expected=UnknownMessageException.class) public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception { final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - datastoreContext, shardStats, "txn", DataStoreVersions.CURRENT_VERSION); + final Props props = ShardTransaction.props(TransactionType.READ_ONLY, readOnlyTransaction(), shard, + datastoreContext, shardStats, "txn"); final TestActorRef transaction = TestActorRef.apply(props,getSystem()); - transaction.receive(new DeleteData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION). - toSerializable(), ActorRef.noSender()); + transaction.receive(new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null), + ActorRef.noSender()); } @Test @@ -625,7 +431,7 @@ public class ShardTransactionTest extends AbstractActorTest { 500, TimeUnit.MILLISECONDS).build(); new JavaTestKit(getSystem()) {{ - final ActorRef transaction = newTransactionActor(store.newReadWriteTransaction(), + final ActorRef transaction = newTransactionActor(RW, readWriteTransaction(), "testShardTransactionInactivity"); watch(transaction); @@ -634,6 +440,35 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } + @Test + public void testOnReceivePreBoronReadData() throws Exception { + new JavaTestKit(getSystem()) {{ + ActorRef transaction = newTransactionActor(RO, readOnlyTransaction(), createShard(), + "testOnReceivePreBoronReadData"); + + transaction.tell(new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.LITHIUM_VERSION). + toSerializable(), getRef()); + + Object replySerialized = expectMsgClass(duration("5 seconds"), ReadDataReply.class); + assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); + }}; + } + + @Test + public void testOnReceivePreBoronDataExists() throws Exception { + new JavaTestKit(getSystem()) {{ + ActorRef transaction = newTransactionActor(RO, readOnlyTransaction(), createShard(), + "testOnReceivePreBoronDataExists"); + + transaction.tell(new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.LITHIUM_VERSION). + toSerializable(), getRef()); + + Object replySerialized = expectMsgClass(duration("5 seconds"), + ShardTransactionMessages.DataExistsReply.class); + assertTrue(DataExistsReply.fromSerializable(replySerialized).exists()); + }}; + } + public static class TestException extends RuntimeException { private static final long serialVersionUID = 1L; }