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=814f90711d43387ee4219bc2c4811ab21ece497d;hb=refs%2Fchanges%2F14%2F82314%2F25;hp=eb829f116f5d4ef053538721d89a1de2a7a2d2d7;hpb=731e7284cf0895fdb1b89427f91762e80e67c2ff;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 eb829f116f..814f90711d 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,10 +10,11 @@ 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; @@ -42,7 +43,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.concurrent.ExecutionException; import java.util.function.Consumer; import org.junit.Before; import org.junit.Test; @@ -67,6 +67,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 +76,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 +85,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()); @@ -134,7 +135,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 +152,7 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void bug4359AddRemoveCarTwice() throws ExecutionException, InterruptedException { + public void bug4359AddRemoveCarTwice() { immediatePayloadReplication(shardDataTree, mockShard); final List candidates = new ArrayList<>(); @@ -300,11 +301,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()); } @@ -347,12 +348,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 -> @@ -374,10 +375,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") @@ -433,13 +433,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 -> @@ -473,7 +473,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()); } @@ -506,18 +506,16 @@ 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()); @@ -525,8 +523,7 @@ public class ShardDataTreeTest extends AbstractTest { }); } - 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"))); } @@ -536,7 +533,7 @@ 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(); @@ -552,7 +549,7 @@ 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();