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=df4c38a0fbb07fe08bb95e6351572aa5fb854696;hb=466078ab1dc8a8cc2981b161051f6edecd6af85a;hp=3ca0f9c7aad2b096754d04af4cd607bd950895b8;hpb=ec870dee9bacb971f11bc747b69e84ac37f5d746;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 3ca0f9c7aa..df4c38a0fb 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,6 +10,7 @@ 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; @@ -32,7 +33,6 @@ 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; @@ -42,7 +42,7 @@ import java.util.ArrayList; import java.util.Collection; 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 +54,7 @@ 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.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -83,17 +83,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 +112,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 +133,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 +150,7 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void bug4359AddRemoveCarTwice() throws ExecutionException, InterruptedException { + public void bug4359AddRemoveCarTwice() { immediatePayloadReplication(shardDataTree, mockShard); final List candidates = new ArrayList<>(); @@ -175,7 +174,7 @@ public class ShardDataTreeTest extends AbstractTest { DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class); shardDataTree.registerTreeChangeListener(CarsModel.CAR_LIST_PATH.node(CarsModel.CAR_QNAME), listener, - Optional.absent(), noop -> { }); + com.google.common.base.Optional.absent(), noop -> { }); addCar(shardDataTree, "optima"); @@ -300,11 +299,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 +346,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 +373,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 +431,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 +471,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()); } @@ -482,7 +480,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" }) @@ -506,18 +504,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 +521,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,12 +531,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); @@ -552,14 +547,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);