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%2FShardDataTreeTest.java;h=2b274ad64b7432b24bb8836dc4a94292d3665446;hb=refs%2Fchanges%2F10%2F84710%2F7;hp=42d0337ba9bfd116eb26d2b35013e1c5c4af186b;hpb=c4f9bb0e408bfaff5c1730e574e8ef1ebe80ac7b;p=controller.git 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 42d0337ba9..2b274ad64b 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 @@ -5,15 +5,15 @@ * 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; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -32,17 +32,15 @@ import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediatePayloadReplication; 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.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ExecutionException; +import java.util.Optional; import java.util.function.Consumer; import org.junit.Before; import org.junit.Test; @@ -54,7 +52,8 @@ import org.opendaylight.controller.cluster.datastore.persisted.CommitTransaction 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.mdsal.dom.api.DOMDataTreeChangeListener; +import org.opendaylight.yangtools.yang.common.Uint64; 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; @@ -67,6 +66,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class ShardDataTreeTest extends AbstractTest { + private static final DatastoreContext DATASTORE_CONTEXT = DatastoreContext.newBuilder().build(); private final Shard mockShard = Mockito.mock(Shard.class); private ShardDataTree shardDataTree; @@ -75,7 +75,8 @@ public class ShardDataTreeTest extends AbstractTest { @Before public void setUp() { doReturn(Ticker.systemTicker()).when(mockShard).ticker(); - doReturn(Mockito.mock(ShardStats.class)).when(mockShard).getShardMBean(); + doReturn(mock(ShardStats.class)).when(mockShard).getShardMBean(); + doReturn(DATASTORE_CONTEXT).when(mockShard).getDatastoreContext(); fullSchema = SchemaContextHelper.full(); @@ -83,17 +84,16 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void testWrite() throws ExecutionException, InterruptedException { + public void testWrite() { modify(false, true, true); } @Test - public void testMerge() throws ExecutionException, InterruptedException { + public void testMerge() { modify(true, true, true); } - private void modify(final boolean merge, final boolean expectedCarsPresent, final boolean expectedPeoplePresent) - throws ExecutionException, InterruptedException { + private void modify(final boolean merge, final boolean expectedCarsPresent, final boolean expectedPeoplePresent) { immediatePayloadReplication(shardDataTree, mockShard); assertEquals(fullSchema, shardDataTree.getSchemaContext()); @@ -113,7 +113,7 @@ public class ShardDataTreeTest extends AbstractTest { snapshot.write(PeopleModel.BASE_PATH, PeopleModel.create()); } - final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction, Optional.empty()); immediateCanCommit(cohort); immediatePreCommit(cohort); @@ -134,7 +134,7 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void bug4359AddRemoveCarOnce() throws ExecutionException, InterruptedException { + public void bug4359AddRemoveCarOnce() { immediatePayloadReplication(shardDataTree, mockShard); final List candidates = new ArrayList<>(); @@ -151,7 +151,7 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void bug4359AddRemoveCarTwice() throws ExecutionException, InterruptedException { + public void bug4359AddRemoveCarTwice() { immediatePayloadReplication(shardDataTree, mockShard); final List candidates = new ArrayList<>(); @@ -174,7 +174,8 @@ public class ShardDataTreeTest extends AbstractTest { immediatePayloadReplication(shardDataTree, mockShard); DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class); - shardDataTree.registerTreeChangeListener(CarsModel.CAR_LIST_PATH.node(CarsModel.CAR_QNAME), listener); + shardDataTree.registerTreeChangeListener(CarsModel.CAR_LIST_PATH.node(CarsModel.CAR_QNAME), listener, + Optional.empty(), noop -> { }); addCar(shardDataTree, "optima"); @@ -197,7 +198,7 @@ public class ShardDataTreeTest extends AbstractTest { shardDataTree.applySnapshot(newDataTree.takeStateSnapshot()); - Map expChanges = Maps.newHashMap(); + Map expChanges = new HashMap<>(); expChanges.put(CarsModel.newCarPath("optima"), ModificationType.WRITE); expChanges.put(CarsModel.newCarPath("murano"), ModificationType.WRITE); expChanges.put(CarsModel.newCarPath("sportage"), ModificationType.DELETE); @@ -225,7 +226,7 @@ public class ShardDataTreeTest extends AbstractTest { snapshot.write(PeopleModel.BASE_PATH, peopleNode)); YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); - MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + MapEntryNode carNode = CarsModel.newCarEntry("optima", Uint64.valueOf(100)); final ShardDataTreeCohort cohort4 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); immediateCanCommit(cohort1); @@ -299,11 +300,11 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(carPath); - assertEquals("Car node present", true, optional.isPresent()); + assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); optional = snapshot.readNode(PeopleModel.BASE_PATH); - assertEquals("People node present", true, optional.isPresent()); + assertTrue("People node present", optional.isPresent()); assertEquals("People node", peopleNode, optional.get()); } @@ -316,7 +317,7 @@ public class ShardDataTreeTest extends AbstractTest { snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); - MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + MapEntryNode carNode = CarsModel.newCarEntry("optima", Uint64.valueOf(100)); final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); final FutureCallback commitCallback2 = immediate3PhaseCommit(cohort2); @@ -346,12 +347,12 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(carPath); - assertEquals("Car node present", true, optional.isPresent()); + assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); } @Test - public void testPipelinedTransactionsWithImmediateReplication() throws Exception { + public void testPipelinedTransactionsWithImmediateReplication() { immediatePayloadReplication(shardDataTree, mockShard); final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> @@ -361,7 +362,7 @@ public class ShardDataTreeTest extends AbstractTest { snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); - MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + MapEntryNode carNode = CarsModel.newCarEntry("optima", Uint64.valueOf(100)); final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); final FutureCallback commitCallback1 = immediate3PhaseCommit(cohort1); @@ -373,10 +374,9 @@ public class ShardDataTreeTest extends AbstractTest { inOrder.verify(commitCallback2).onSuccess(any(UnsignedLong.class)); inOrder.verify(commitCallback3).onSuccess(any(UnsignedLong.class)); - final DataTreeSnapshot snapshot = - shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(CarsModel.BASE_PATH); - assertEquals("Car node present", true, optional.isPresent()); + assertTrue("Car node present", optional.isPresent()); } @SuppressWarnings("unchecked") @@ -392,7 +392,7 @@ public class ShardDataTreeTest extends AbstractTest { snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); - MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + MapEntryNode carNode = CarsModel.newCarEntry("optima", Uint64.valueOf(100)); final ShardDataTreeCohort cohort4 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); coordinatedCanCommit(cohort2); @@ -432,13 +432,13 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(carPath); - assertEquals("Car node present", true, optional.isPresent()); + assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); } @SuppressWarnings("unchecked") @Test - public void testAbortWithFailedRebase() throws Exception { + public void testAbortWithFailedRebase() { immediatePayloadReplication(shardDataTree, mockShard); final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> @@ -472,7 +472,7 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(PeopleModel.BASE_PATH); - assertEquals("People node present", true, optional.isPresent()); + assertTrue("People node present", optional.isPresent()); assertEquals("People node", peopleNode, optional.get()); } @@ -481,7 +481,7 @@ public class ShardDataTreeTest extends AbstractTest { shardDataTree.newReadWriteTransaction(nextTransactionId()); final DataTreeModification snapshot = transaction.getSnapshot(); operation.execute(snapshot); - return shardDataTree.finishTransaction(transaction); + return shardDataTree.finishTransaction(transaction, Optional.empty()); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -505,27 +505,24 @@ public class ShardDataTreeTest extends AbstractTest { final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); - assertEquals(true, optional.isPresent()); + assertTrue(optional.isPresent()); return optional.get(); } - private static DataTreeCandidate addCar(final ShardDataTree shardDataTree) - throws ExecutionException, InterruptedException { + private static DataTreeCandidate addCar(final ShardDataTree shardDataTree) { return addCar(shardDataTree, "altima"); } - private static DataTreeCandidate addCar(final ShardDataTree shardDataTree, final String name) - throws ExecutionException, InterruptedException { + private static DataTreeCandidate addCar(final ShardDataTree shardDataTree, final String name) { 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"))); + snapshot.write(CarsModel.newCarPath(name), CarsModel.newCarEntry(name, Uint64.valueOf(100))); }); } - private static DataTreeCandidate removeCar(final ShardDataTree shardDataTree) - throws ExecutionException, InterruptedException { + private static DataTreeCandidate removeCar(final ShardDataTree shardDataTree) { return doTransaction(shardDataTree, snapshot -> snapshot.delete(CarsModel.newCarPath("altima"))); } @@ -535,12 +532,12 @@ public class ShardDataTreeTest extends AbstractTest { } private static DataTreeCandidate doTransaction(final ShardDataTree shardDataTree, - final DataTreeOperation operation) throws ExecutionException, InterruptedException { + final DataTreeOperation operation) { final ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction(nextTransactionId()); final DataTreeModification snapshot = transaction.getSnapshot(); operation.execute(snapshot); - final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction, Optional.empty()); immediateCanCommit(cohort); immediatePreCommit(cohort); @@ -551,14 +548,14 @@ public class ShardDataTreeTest extends AbstractTest { } private static DataTreeCandidate applyCandidates(final ShardDataTree shardDataTree, - final List candidates) throws ExecutionException, InterruptedException { + final List candidates) { final ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction(nextTransactionId()); final DataTreeModification snapshot = transaction.getSnapshot(); for (final DataTreeCandidate candidateTip : candidates) { DataTreeCandidates.applyToModification(snapshot, candidateTip); } - final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction, Optional.empty()); immediateCanCommit(cohort); immediatePreCommit(cohort);