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%2FDataTreeCohortActorTest.java;h=aaf02600278eb6b844c4d103521a02612da2b54d;hp=16c567c9e0e581b1259b6327b948da2ea0c0a90d;hb=55ac0d700c4b20f145924b169b938321dc10a476;hpb=1a9684ec6ce9dae26b3292028f6a2b3fa5d61cc4 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java index 16c567c9e0..aaf0260027 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; 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; @@ -108,13 +109,12 @@ public class DataTreeCohortActorTest extends AbstractActorTest { askAndAwait(cohortActor, new Commit(txId2)); } - @SuppressWarnings("unchecked") @Test public void testAsyncCohort() throws Exception { ListeningExecutorService executor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()); doReturn(executeWithDelay(executor, mockPostCanCommit)) - .when(mockCohort).canCommit(any(Object.class), any(SchemaContext.class), any(Collection.class)); + .when(mockCohort).canCommit(any(Object.class), any(SchemaContext.class), anyCollection()); doReturn(executor.submit(() -> mockPostPreCommit)).when(mockPostCanCommit).preCommit(); @@ -135,13 +135,12 @@ public class DataTreeCohortActorTest extends AbstractActorTest { executor.shutdownNow(); } - @SuppressWarnings("unchecked") @Test public void testFailureOnCanCommit() throws Exception { DataValidationFailedException failure = new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock"); doReturn(FluentFutures.immediateFailedFluentFuture(failure)).when(mockCohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); ActorRef cohortActor = newCohortActor("testFailureOnCanCommit"); @@ -199,13 +198,12 @@ public class DataTreeCohortActorTest extends AbstractActorTest { return actorFactory.createActor(DataTreeCohortActor.props(mockCohort, YangInstanceIdentifier.empty()), name); } - @SuppressWarnings("unchecked") private void resetMockCohort() { reset(mockCohort); doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostCanCommit).abort(); doReturn(Futures.immediateFuture(mockPostPreCommit)).when(mockPostCanCommit).preCommit(); doReturn(FluentFutures.immediateFluentFuture(mockPostCanCommit)).when(mockCohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostPreCommit).abort(); doReturn(Futures.immediateFuture(null)).when(mockPostPreCommit).commit();