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%2FDataTreeCohortIntegrationTest.java;h=8fafe96cb3263d5a60434c06c7e69672a5585174;hb=55ac0d700c4b20f145924b169b938321dc10a476;hp=ee7fe1fd0ff1998a43eb11be52e019eaf976610e;hpb=5fa5244653ee7ad3042324fb1f21fad69581b3d2;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java index ee7fe1fd0f..8fafe96cb3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java @@ -5,14 +5,14 @@ * 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.assertSame; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -24,12 +24,11 @@ import akka.actor.Address; import akka.actor.AddressFromURIString; import akka.cluster.Cluster; import akka.testkit.javadsl.TestKit; -import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.util.concurrent.FluentFuture; import com.typesafe.config.ConfigFactory; -import java.math.BigInteger; import java.util.Collection; +import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.junit.AfterClass; @@ -51,12 +50,13 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.util.concurrent.FluentFutures; +import org.opendaylight.yangtools.yang.common.Uint64; 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.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.tree.api.ModificationType; import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class DataTreeCohortIntegrationTest { @@ -96,7 +96,7 @@ public class DataTreeCohortIntegrationTest { public void testSuccessfulCanCommitWithNoopPostStep() throws Exception { final DOMDataTreeCommitCohort cohort = mock(DOMDataTreeCommitCohort.class); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); ArgumentCaptor candidateCapt = ArgumentCaptor.forClass(Collection.class); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); @@ -113,15 +113,17 @@ public class DataTreeCohortIntegrationTest { kit.testWriteTransaction(dataStore, TestModel.TEST_PATH, node); verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), candidateCapt.capture()); assertDataTreeCandidate((DOMDataTreeCandidate) candidateCapt.getValue().iterator().next(), TEST_ID, - ModificationType.WRITE, Optional.of(node), Optional.absent()); + ModificationType.WRITE, Optional.of(node), Optional.empty()); reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); kit.testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build()); - verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), any(Collection.class)); + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME) + .withChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 42)) + .build()); + verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), anyCollection()); cohortReg.close(); @@ -133,13 +135,12 @@ public class DataTreeCohortIntegrationTest { } } - @SuppressWarnings("unchecked") @Test public void testFailedCanCommit() throws Exception { final DOMDataTreeCommitCohort failedCohort = mock(DOMDataTreeCommitCohort.class); doReturn(FAILED_CAN_COMMIT_FUTURE).when(failedCohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( @@ -166,7 +167,7 @@ public class DataTreeCohortIntegrationTest { public void testCanCommitWithListEntries() throws Exception { final DOMDataTreeCommitCohort cohort = mock(DOMDataTreeCommitCohort.class); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( @@ -191,7 +192,7 @@ public class DataTreeCohortIntegrationTest { writeTx = dataStore.newWriteOnlyTransaction(); final YangInstanceIdentifier optimaPath = CarsModel.newCarPath("optima"); - final MapEntryNode optimaNode = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000)); + final MapEntryNode optimaNode = CarsModel.newCarEntry("optima", Uint64.valueOf(20000)); writeTx.write(optimaPath, optimaNode); kit.doCommit(writeTx.ready()); @@ -199,7 +200,7 @@ public class DataTreeCohortIntegrationTest { verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), candidateCapture.capture()); assertDataTreeCandidate((DOMDataTreeCandidate) candidateCapture.getValue().iterator().next(), new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, optimaPath), ModificationType.WRITE, - Optional.of(optimaNode), Optional.absent()); + Optional.of(optimaNode), Optional.empty()); // Write replace the cars container with 2 new car entries. The cohort should get invoked with 3 // DOMDataTreeCandidates: once for each of the 2 new car entries (WRITE mod) and once for the deleted prior @@ -207,13 +208,13 @@ public class DataTreeCohortIntegrationTest { reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); writeTx = dataStore.newWriteOnlyTransaction(); final YangInstanceIdentifier sportagePath = CarsModel.newCarPath("sportage"); - final MapEntryNode sportageNode = CarsModel.newCarEntry("sportage", BigInteger.valueOf(20000)); + final MapEntryNode sportageNode = CarsModel.newCarEntry("sportage", Uint64.valueOf(20000)); final YangInstanceIdentifier soulPath = CarsModel.newCarPath("soul"); - final MapEntryNode soulNode = CarsModel.newCarEntry("soul", BigInteger.valueOf(20000)); + final MapEntryNode soulNode = CarsModel.newCarEntry("soul", Uint64.valueOf(20000)); writeTx.write(CarsModel.BASE_PATH, CarsModel.newCarsNode(CarsModel.newCarsMapNode(sportageNode,soulNode))); kit.doCommit(writeTx.ready()); @@ -222,21 +223,21 @@ public class DataTreeCohortIntegrationTest { assertDataTreeCandidate(findCandidate(candidateCapture, sportagePath), new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, sportagePath), ModificationType.WRITE, - Optional.of(sportageNode), Optional.absent()); + Optional.of(sportageNode), Optional.empty()); assertDataTreeCandidate(findCandidate(candidateCapture, soulPath), new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, soulPath), ModificationType.WRITE, - Optional.of(soulNode), Optional.absent()); + Optional.of(soulNode), Optional.empty()); assertDataTreeCandidate(findCandidate(candidateCapture, optimaPath), new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, optimaPath), ModificationType.DELETE, - Optional.absent(), Optional.of(optimaNode)); + Optional.empty(), Optional.of(optimaNode)); // Delete the cars container - cohort should be invoked for the 2 deleted car entries. reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); writeTx = dataStore.newWriteOnlyTransaction(); writeTx.delete(CarsModel.BASE_PATH); @@ -247,11 +248,11 @@ public class DataTreeCohortIntegrationTest { assertDataTreeCandidate(findCandidate(candidateCapture, sportagePath), new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, sportagePath), ModificationType.DELETE, - Optional.absent(), Optional.of(sportageNode)); + Optional.empty(), Optional.of(sportageNode)); assertDataTreeCandidate(findCandidate(candidateCapture, soulPath), new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, soulPath), ModificationType.DELETE, - Optional.absent(), Optional.of(soulNode)); + Optional.empty(), Optional.of(soulNode)); } } @@ -274,7 +275,6 @@ public class DataTreeCohortIntegrationTest { * DataTreeCandidate) and since currently preCommit is a noop in the Shard backend (it is combined with commit), * we can't actually test abort after canCommit. */ - @SuppressWarnings("unchecked") @Test @Ignore public void testAbortAfterCanCommit() throws Exception { @@ -283,7 +283,7 @@ public class DataTreeCohortIntegrationTest { doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(stepToAbort).abort(); doReturn(PostPreCommitStep.NOOP_FUTURE).when(stepToAbort).preCommit(); doReturn(FluentFutures.immediateFluentFuture(stepToAbort)).when(cohortToAbort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( @@ -307,7 +307,7 @@ public class DataTreeCohortIntegrationTest { private static void assertDataTreeCandidate(final DOMDataTreeCandidate candidate, final DOMDataTreeIdentifier expTreeId, final ModificationType expType, - final Optional> expDataAfter, final Optional> expDataBefore) { + final Optional expDataAfter, final Optional expDataBefore) { assertNotNull("Expected candidate for path " + expTreeId.getRootIdentifier(), candidate); assertEquals("rootPath", expTreeId, candidate.getRootPath()); assertEquals("modificationType", expType, candidate.getRootNode().getModificationType());