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%2FShardDataTreeTest.java;h=6f0b32b4506ebce3f3886fe227cfc5afbdf231a9;hp=4064dd07e9c5e66a66aca11ae333d7c76543692c;hb=29aa3b83db308b1a511857db8d918e0f2e629407;hpb=ecccb6d5b43dd73aef0d2d19349d19ee9b4728f7 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java index 4064dd07e9..6f0b32b450 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java @@ -10,54 +10,101 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.coordinatedCanCommit; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.coordinatedCommit; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.coordinatedPreCommit; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediate3PhaseCommit; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediateCanCommit; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediateCommit; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediatePreCommit; + import com.google.common.base.Optional; +import com.google.common.base.Ticker; +import com.google.common.collect.Maps; +import com.google.common.primitives.UnsignedLong; +import com.google.common.util.concurrent.FutureCallback; import java.math.BigInteger; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutionException; +import java.util.function.Consumer; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.InOrder; +import org.mockito.Mockito; +import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; +import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload; import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; +import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidates; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; +import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; +import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class ShardDataTreeTest { +public class ShardDataTreeTest extends AbstractTest { - SchemaContext fullSchema; + private final Shard mockShard = Mockito.mock(Shard.class); + private ShardDataTree shardDataTree; + private SchemaContext fullSchema; @Before - public void setUp(){ + public void setUp() { + doReturn(true).when(mockShard).canSkipPayload(); + doReturn(Ticker.systemTicker()).when(mockShard).ticker(); + doReturn(Mockito.mock(ShardStats.class)).when(mockShard).getShardMBean(); + fullSchema = SchemaContextHelper.full(); + + shardDataTree = new ShardDataTree(mockShard, fullSchema, TreeType.OPERATIONAL); } @Test public void testWrite() throws ExecutionException, InterruptedException { - modify(new ShardDataTree(fullSchema), false, true, true); + modify(false, true, true); } @Test public void testMerge() throws ExecutionException, InterruptedException { - modify(new ShardDataTree(fullSchema), true, true, true); + modify(true, true, true); } - - private void modify(ShardDataTree shardDataTree, boolean merge, boolean expectedCarsPresent, boolean expectedPeoplePresent) throws ExecutionException, InterruptedException { + private void modify(final boolean merge, final boolean expectedCarsPresent, final boolean expectedPeoplePresent) + throws ExecutionException, InterruptedException { assertEquals(fullSchema, shardDataTree.getSchemaContext()); - ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction("txn-1", null); + final ReadWriteShardDataTreeTransaction transaction = + shardDataTree.newReadWriteTransaction(nextTransactionId()); - DataTreeModification snapshot = transaction.getSnapshot(); + final DataTreeModification snapshot = transaction.getSnapshot(); assertNotNull(snapshot); - if(merge){ + if (merge) { snapshot.merge(CarsModel.BASE_PATH, CarsModel.create()); snapshot.merge(PeopleModel.BASE_PATH, PeopleModel.create()); } else { @@ -65,129 +112,426 @@ public class ShardDataTreeTest { snapshot.write(PeopleModel.BASE_PATH, PeopleModel.create()); } - ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); - - cohort.preCommit().get(); - cohort.commit().get(); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + immediateCanCommit(cohort); + immediatePreCommit(cohort); + immediateCommit(cohort); - ReadOnlyShardDataTreeTransaction readOnlyShardDataTreeTransaction = shardDataTree.newReadOnlyTransaction("txn-2", null); + final ReadOnlyShardDataTreeTransaction readOnlyShardDataTreeTransaction = + shardDataTree.newReadOnlyTransaction(nextTransactionId()); - DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); + final DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); - Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); + final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); assertEquals(expectedCarsPresent, optional.isPresent()); - Optional> optional1 = snapshot1.readNode(PeopleModel.BASE_PATH); + final Optional> optional1 = snapshot1.readNode(PeopleModel.BASE_PATH); assertEquals(expectedPeoplePresent, optional1.isPresent()); - } @Test public void bug4359AddRemoveCarOnce() throws ExecutionException, InterruptedException { - ShardDataTree shardDataTree = new ShardDataTree(fullSchema); - - List candidates = new ArrayList<>(); + final List candidates = new ArrayList<>(); candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); - NormalizedNode expected = getCars(shardDataTree); + final NormalizedNode expected = getCars(shardDataTree); applyCandidates(shardDataTree, candidates); - NormalizedNode actual = getCars(shardDataTree); + final NormalizedNode actual = getCars(shardDataTree); assertEquals(expected, actual); } @Test public void bug4359AddRemoveCarTwice() throws ExecutionException, InterruptedException { - ShardDataTree shardDataTree = new ShardDataTree(fullSchema); - - List candidates = new ArrayList<>(); + final List candidates = new ArrayList<>(); candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); - NormalizedNode expected = getCars(shardDataTree); + final NormalizedNode expected = getCars(shardDataTree); applyCandidates(shardDataTree, candidates); - NormalizedNode actual = getCars(shardDataTree); + final NormalizedNode actual = getCars(shardDataTree); assertEquals(expected, actual); } - private static NormalizedNode getCars(ShardDataTree shardDataTree) { - ReadOnlyShardDataTreeTransaction readOnlyShardDataTreeTransaction = shardDataTree.newReadOnlyTransaction("txn-2", null); - DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); + @Test + public void testListenerNotifiedOnApplySnapshot() throws Exception { + DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class); + shardDataTree.registerTreeChangeListener(CarsModel.CAR_LIST_PATH.node(CarsModel.CAR_QNAME), listener); - Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); + addCar(shardDataTree, "optima"); - assertEquals(true, optional.isPresent()); + verifyOnDataTreeChanged(listener, dtc -> { + assertEquals("getModificationType", ModificationType.WRITE, dtc.getRootNode().getModificationType()); + assertEquals("getRootPath", CarsModel.newCarPath("optima"), dtc.getRootPath()); + }); - System.out.println(optional.get()); + addCar(shardDataTree, "sportage"); - return optional.get(); - } + verifyOnDataTreeChanged(listener, dtc -> { + assertEquals("getModificationType", ModificationType.WRITE, dtc.getRootNode().getModificationType()); + assertEquals("getRootPath", CarsModel.newCarPath("sportage"), dtc.getRootPath()); + }); - private static DataTreeCandidateTip addCar(ShardDataTree shardDataTree) throws ExecutionException, InterruptedException { - return doTransaction(shardDataTree, new DataTreeOperation() { - @Override - public void execute(DataTreeModification snapshot) { - snapshot.merge(CarsModel.BASE_PATH, CarsModel.emptyContainer()); - snapshot.merge(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode()); - snapshot.write(CarsModel.newCarPath("altima"), CarsModel.newCarEntry("altima", new BigInteger("100"))); - } + ShardDataTree newDataTree = new ShardDataTree(mockShard, fullSchema, TreeType.OPERATIONAL); + addCar(newDataTree, "optima"); + addCar(newDataTree, "murano"); + + shardDataTree.applySnapshot(newDataTree.takeStateSnapshot()); + + Map expChanges = Maps.newHashMap(); + expChanges.put(CarsModel.newCarPath("optima"), ModificationType.WRITE); + expChanges.put(CarsModel.newCarPath("murano"), ModificationType.WRITE); + expChanges.put(CarsModel.newCarPath("sportage"), ModificationType.DELETE); + verifyOnDataTreeChanged(listener, dtc -> { + ModificationType expType = expChanges.remove(dtc.getRootPath()); + assertNotNull("Got unexpected change for " + dtc.getRootPath(), expType); + assertEquals("getModificationType", expType, dtc.getRootNode().getModificationType()); }); + + if (!expChanges.isEmpty()) { + fail("Missing change notifications: " + expChanges); + } + } + + @Test + public void testPipelinedTransactionsWithCoordinatedCommits() throws Exception { + doReturn(false).when(mockShard).canSkipPayload(); + + final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); + + final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); + + NormalizedNode peopleNode = PeopleModel.create(); + final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> + snapshot.write(PeopleModel.BASE_PATH, peopleNode)); + + YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); + MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + final ShardDataTreeCohort cohort4 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); + + immediateCanCommit(cohort1); + final FutureCallback canCommitCallback2 = coordinatedCanCommit(cohort2); + final FutureCallback canCommitCallback3 = coordinatedCanCommit(cohort3); + final FutureCallback canCommitCallback4 = coordinatedCanCommit(cohort4); + + final FutureCallback preCommitCallback1 = coordinatedPreCommit(cohort1); + verify(preCommitCallback1).onSuccess(cohort1.getCandidate()); + verify(canCommitCallback2).onSuccess(null); + + final FutureCallback preCommitCallback2 = coordinatedPreCommit(cohort2); + verify(preCommitCallback2).onSuccess(cohort2.getCandidate()); + verify(canCommitCallback3).onSuccess(null); + + final FutureCallback preCommitCallback3 = coordinatedPreCommit(cohort3); + verify(preCommitCallback3).onSuccess(cohort3.getCandidate()); + verify(canCommitCallback4).onSuccess(null); + + final FutureCallback preCommitCallback4 = coordinatedPreCommit(cohort4); + verify(preCommitCallback4).onSuccess(cohort4.getCandidate()); + + final FutureCallback commitCallback2 = coordinatedCommit(cohort2); + verify(mockShard, never()).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + anyBoolean()); + verifyNoMoreInteractions(commitCallback2); + + final FutureCallback commitCallback4 = coordinatedCommit(cohort4); + verify(mockShard, never()).persistPayload(eq(cohort4.getIdentifier()), any(CommitTransactionPayload.class), + anyBoolean()); + verifyNoMoreInteractions(commitCallback4); + + final FutureCallback commitCallback1 = coordinatedCommit(cohort1); + InOrder inOrder = inOrder(mockShard); + inOrder.verify(mockShard).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + eq(true)); + inOrder.verify(mockShard).persistPayload(eq(cohort2.getIdentifier()), any(CommitTransactionPayload.class), + eq(false)); + verifyNoMoreInteractions(commitCallback1); + verifyNoMoreInteractions(commitCallback2); + + final FutureCallback commitCallback3 = coordinatedCommit(cohort3); + inOrder = inOrder(mockShard); + inOrder.verify(mockShard).persistPayload(eq(cohort3.getIdentifier()), any(CommitTransactionPayload.class), + eq(true)); + inOrder.verify(mockShard).persistPayload(eq(cohort4.getIdentifier()), any(CommitTransactionPayload.class), + eq(false)); + verifyNoMoreInteractions(commitCallback3); + verifyNoMoreInteractions(commitCallback4); + + final ShardDataTreeCohort cohort5 = newShardDataTreeCohort(snapshot -> + snapshot.merge(CarsModel.BASE_PATH, CarsModel.emptyContainer())); + final FutureCallback canCommitCallback5 = coordinatedCanCommit(cohort5); + + // The payload instance doesn't matter - it just needs to be of type CommitTransactionPayload. + CommitTransactionPayload mockPayload = CommitTransactionPayload.create(nextTransactionId(), + cohort1.getCandidate()); + shardDataTree.applyReplicatedPayload(cohort1.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort2.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort3.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort4.getIdentifier(), mockPayload); + + inOrder = inOrder(commitCallback1, commitCallback2, commitCallback3, commitCallback4); + inOrder.verify(commitCallback1).onSuccess(any(UnsignedLong.class)); + inOrder.verify(commitCallback2).onSuccess(any(UnsignedLong.class)); + inOrder.verify(commitCallback3).onSuccess(any(UnsignedLong.class)); + inOrder.verify(commitCallback4).onSuccess(any(UnsignedLong.class)); + + verify(canCommitCallback5).onSuccess(null); + + final DataTreeSnapshot snapshot = + shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + Optional> optional = snapshot.readNode(carPath); + assertEquals("Car node present", true, optional.isPresent()); + assertEquals("Car node", carNode, optional.get()); + + optional = snapshot.readNode(PeopleModel.BASE_PATH); + assertEquals("People node present", true, optional.isPresent()); + assertEquals("People node", peopleNode, optional.get()); + } + + @Test + public void testPipelinedTransactionsWithImmediateCommits() throws Exception { + doReturn(false).when(mockShard).canSkipPayload(); + + final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); + + final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); + + YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); + MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); + + final FutureCallback commitCallback2 = immediate3PhaseCommit(cohort2); + final FutureCallback commitCallback3 = immediate3PhaseCommit(cohort3); + final FutureCallback commitCallback1 = immediate3PhaseCommit(cohort1); + + InOrder inOrder = inOrder(mockShard); + inOrder.verify(mockShard).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + eq(true)); + inOrder.verify(mockShard).persistPayload(eq(cohort2.getIdentifier()), any(CommitTransactionPayload.class), + eq(true)); + inOrder.verify(mockShard).persistPayload(eq(cohort3.getIdentifier()), any(CommitTransactionPayload.class), + eq(false)); + + // The payload instance doesn't matter - it just needs to be of type CommitTransactionPayload. + CommitTransactionPayload mockPayload = CommitTransactionPayload.create(nextTransactionId(), + cohort1.getCandidate()); + shardDataTree.applyReplicatedPayload(cohort1.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort2.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort3.getIdentifier(), mockPayload); + + inOrder = inOrder(commitCallback1, commitCallback2, commitCallback3); + inOrder.verify(commitCallback1).onSuccess(any(UnsignedLong.class)); + inOrder.verify(commitCallback2).onSuccess(any(UnsignedLong.class)); + inOrder.verify(commitCallback3).onSuccess(any(UnsignedLong.class)); + + final DataTreeSnapshot snapshot = + shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + Optional> optional = snapshot.readNode(carPath); + assertEquals("Car node present", true, optional.isPresent()); + assertEquals("Car node", carNode, optional.get()); + } + + @SuppressWarnings("unchecked") + @Test + public void testAbortWithPendingCommits() throws Exception { + doReturn(false).when(mockShard).canSkipPayload(); + + final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); + + final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> + snapshot.write(PeopleModel.BASE_PATH, PeopleModel.create())); + + final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); + + YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); + MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + final ShardDataTreeCohort cohort4 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); + + coordinatedCanCommit(cohort2); + immediateCanCommit(cohort1); + coordinatedCanCommit(cohort3); + coordinatedCanCommit(cohort4); + + coordinatedPreCommit(cohort1); + coordinatedPreCommit(cohort2); + coordinatedPreCommit(cohort3); + + FutureCallback mockAbortCallback = mock(FutureCallback.class); + doNothing().when(mockAbortCallback).onSuccess(null); + cohort2.abort(mockAbortCallback); + verify(mockAbortCallback).onSuccess(null); + + coordinatedPreCommit(cohort4); + coordinatedCommit(cohort1); + coordinatedCommit(cohort3); + coordinatedCommit(cohort4); + + InOrder inOrder = inOrder(mockShard); + inOrder.verify(mockShard).persistPayload(eq(cohort1.getIdentifier()), any(CommitTransactionPayload.class), + eq(false)); + inOrder.verify(mockShard).persistPayload(eq(cohort3.getIdentifier()), any(CommitTransactionPayload.class), + eq(false)); + inOrder.verify(mockShard).persistPayload(eq(cohort4.getIdentifier()), any(CommitTransactionPayload.class), + eq(false)); + + // The payload instance doesn't matter - it just needs to be of type CommitTransactionPayload. + CommitTransactionPayload mockPayload = CommitTransactionPayload.create(nextTransactionId(), + cohort1.getCandidate()); + shardDataTree.applyReplicatedPayload(cohort1.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort3.getIdentifier(), mockPayload); + shardDataTree.applyReplicatedPayload(cohort4.getIdentifier(), mockPayload); + + final DataTreeSnapshot snapshot = + shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + Optional> optional = snapshot.readNode(carPath); + assertEquals("Car node present", true, optional.isPresent()); + assertEquals("Car node", carNode, optional.get()); + } + + @SuppressWarnings("unchecked") + @Test + public void testAbortWithFailedRebase() throws Exception { + final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); + + final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); + + NormalizedNode peopleNode = PeopleModel.create(); + final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> + snapshot.write(PeopleModel.BASE_PATH, peopleNode)); + + immediateCanCommit(cohort1); + FutureCallback canCommitCallback2 = coordinatedCanCommit(cohort2); + + coordinatedPreCommit(cohort1); + verify(canCommitCallback2).onSuccess(null); + + FutureCallback mockAbortCallback = mock(FutureCallback.class); + doNothing().when(mockAbortCallback).onSuccess(null); + cohort1.abort(mockAbortCallback); + verify(mockAbortCallback).onSuccess(null); + + FutureCallback preCommitCallback2 = coordinatedPreCommit(cohort2); + verify(preCommitCallback2).onFailure(any(Throwable.class)); + + immediateCanCommit(cohort3); + immediatePreCommit(cohort3); + immediateCommit(cohort3); + + final DataTreeSnapshot snapshot = + shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + Optional> optional = snapshot.readNode(PeopleModel.BASE_PATH); + assertEquals("People node present", true, optional.isPresent()); + assertEquals("People node", peopleNode, optional.get()); } - private static DataTreeCandidateTip removeCar(ShardDataTree shardDataTree) throws ExecutionException, InterruptedException { - return doTransaction(shardDataTree, new DataTreeOperation() { - @Override - public void execute(DataTreeModification snapshot) { - snapshot.delete(CarsModel.newCarPath("altima")); + private ShardDataTreeCohort newShardDataTreeCohort(final DataTreeOperation operation) { + final ReadWriteShardDataTreeTransaction transaction = + shardDataTree.newReadWriteTransaction(nextTransactionId()); + final DataTreeModification snapshot = transaction.getSnapshot(); + operation.execute(snapshot); + return shardDataTree.finishTransaction(transaction); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static void verifyOnDataTreeChanged(final DOMDataTreeChangeListener listener, + final Consumer callback) { + ArgumentCaptor changes = ArgumentCaptor.forClass(Collection.class); + verify(listener, atLeastOnce()).onDataTreeChanged(changes.capture()); + for (Collection list : changes.getAllValues()) { + for (Object dtc : list) { + callback.accept((DataTreeCandidate)dtc); } - }); + } + + reset(listener); + } + + private static NormalizedNode getCars(final ShardDataTree shardDataTree) { + final ReadOnlyShardDataTreeTransaction readOnlyShardDataTreeTransaction = + shardDataTree.newReadOnlyTransaction(nextTransactionId()); + final DataTreeSnapshot snapshot1 = readOnlyShardDataTreeTransaction.getSnapshot(); + + final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); + + assertEquals(true, optional.isPresent()); + + return optional.get(); + } + + private static DataTreeCandidate addCar(final ShardDataTree shardDataTree) + throws ExecutionException, InterruptedException { + return addCar(shardDataTree, "altima"); } - private abstract static class DataTreeOperation { - public abstract void execute(DataTreeModification snapshot); + private static DataTreeCandidate addCar(final ShardDataTree shardDataTree, final String name) + throws ExecutionException, InterruptedException { + return doTransaction(shardDataTree, snapshot -> { + snapshot.merge(CarsModel.BASE_PATH, CarsModel.emptyContainer()); + snapshot.merge(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode()); + snapshot.write(CarsModel.newCarPath(name), CarsModel.newCarEntry(name, new BigInteger("100"))); + }); } - private static DataTreeCandidateTip doTransaction(ShardDataTree shardDataTree, DataTreeOperation operation) + private static DataTreeCandidate removeCar(final ShardDataTree shardDataTree) throws ExecutionException, InterruptedException { - ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction("txn-1", null); - DataTreeModification snapshot = transaction.getSnapshot(); + return doTransaction(shardDataTree, snapshot -> snapshot.delete(CarsModel.newCarPath("altima"))); + } + + @FunctionalInterface + private interface DataTreeOperation { + void execute(DataTreeModification snapshot); + } + + private static DataTreeCandidate doTransaction(final ShardDataTree shardDataTree, + final DataTreeOperation operation) throws ExecutionException, InterruptedException { + final ReadWriteShardDataTreeTransaction transaction = + shardDataTree.newReadWriteTransaction(nextTransactionId()); + final DataTreeModification snapshot = transaction.getSnapshot(); operation.execute(snapshot); - ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); - cohort.canCommit().get(); - cohort.preCommit().get(); - DataTreeCandidateTip candidate = cohort.getCandidate(); - cohort.commit().get(); + immediateCanCommit(cohort); + immediatePreCommit(cohort); + final DataTreeCandidate candidate = cohort.getCandidate(); + immediateCommit(cohort); return candidate; } - private static DataTreeCandidateTip applyCandidates(ShardDataTree shardDataTree, List candidates) - throws ExecutionException, InterruptedException { - ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction("txn-1", null); - DataTreeModification snapshot = transaction.getSnapshot(); - for(DataTreeCandidateTip candidateTip : candidates){ + private static DataTreeCandidate applyCandidates(final ShardDataTree shardDataTree, + final List candidates) throws ExecutionException, InterruptedException { + final ReadWriteShardDataTreeTransaction transaction = + shardDataTree.newReadWriteTransaction(nextTransactionId()); + final DataTreeModification snapshot = transaction.getSnapshot(); + for (final DataTreeCandidate candidateTip : candidates) { DataTreeCandidates.applyToModification(snapshot, candidateTip); } - ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); - cohort.canCommit().get(); - cohort.preCommit().get(); - DataTreeCandidateTip candidate = cohort.getCandidate(); - cohort.commit().get(); + immediateCanCommit(cohort); + immediatePreCommit(cohort); + final DataTreeCandidate candidate = cohort.getCandidate(); + immediateCommit(cohort); return candidate; } - -} \ No newline at end of file +}