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=16c567c9e0e581b1259b6327b948da2ea0c0a90d;hp=ce60c592f2150c88257ebf2a485263c6defe8639;hb=e84f63ee098fff5b02cbce1281ca0d1208f966fa;hpb=258d8039ac144aeee2efa7943228c0fc6cdaf651 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 ce60c592f2..16c567c9e0 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 @@ -9,7 +9,7 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify; import akka.actor.ActorRef; import akka.pattern.Patterns; import akka.util.Timeout; +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.Uninterruptibles; @@ -43,8 +43,9 @@ import org.opendaylight.mdsal.common.api.PostPreCommitStep; import org.opendaylight.mdsal.common.api.ThreePhaseCommitStep; import org.opendaylight.mdsal.dom.api.DOMDataTreeCandidate; import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; +import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; +import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import scala.concurrent.Await; @@ -77,7 +78,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { TransactionIdentifier txId = nextTransactionId(); askAndAwait(cohortActor, new CanCommit(txId, CANDIDATES, MOCK_SCHEMA, cohortActor)); - verify(mockCohort).canCommit(txId, CANDIDATES, MOCK_SCHEMA); + verify(mockCohort).canCommit(txId, MOCK_SCHEMA, CANDIDATES); askAndAwait(cohortActor, new PreCommit(txId)); verify(mockPostCanCommit).preCommit(); @@ -87,7 +88,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { resetMockCohort(); askAndAwait(cohortActor, new CanCommit(txId, CANDIDATES, MOCK_SCHEMA, cohortActor)); - verify(mockCohort).canCommit(txId, CANDIDATES, MOCK_SCHEMA); + verify(mockCohort).canCommit(txId, MOCK_SCHEMA, CANDIDATES); } @Test @@ -112,9 +113,8 @@ public class DataTreeCohortActorTest extends AbstractActorTest { public void testAsyncCohort() throws Exception { ListeningExecutorService executor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()); - doReturn(Futures.makeChecked(executeWithDelay(executor, mockPostCanCommit), - ex -> new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock"))) - .when(mockCohort).canCommit(any(Object.class), any(Collection.class), any(SchemaContext.class)); + doReturn(executeWithDelay(executor, mockPostCanCommit)) + .when(mockCohort).canCommit(any(Object.class), any(SchemaContext.class), any(Collection.class)); doReturn(executor.submit(() -> mockPostPreCommit)).when(mockPostCanCommit).preCommit(); @@ -124,7 +124,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { TransactionIdentifier txId = nextTransactionId(); askAndAwait(cohortActor, new CanCommit(txId, CANDIDATES, MOCK_SCHEMA, cohortActor)); - verify(mockCohort).canCommit(txId, CANDIDATES, MOCK_SCHEMA); + verify(mockCohort).canCommit(txId, MOCK_SCHEMA, CANDIDATES); askAndAwait(cohortActor, new PreCommit(txId)); verify(mockPostCanCommit).preCommit(); @@ -138,9 +138,10 @@ public class DataTreeCohortActorTest extends AbstractActorTest { @SuppressWarnings("unchecked") @Test public void testFailureOnCanCommit() throws Exception { - DataValidationFailedException failure = new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock"); - doReturn(Futures.immediateFailedCheckedFuture(failure)).when(mockCohort).canCommit(any(Object.class), - any(Collection.class), any(SchemaContext.class)); + DataValidationFailedException failure = new DataValidationFailedException(YangInstanceIdentifier.empty(), + "mock"); + doReturn(FluentFutures.immediateFailedFluentFuture(failure)).when(mockCohort).canCommit(any(Object.class), + any(SchemaContext.class), any(Collection.class)); ActorRef cohortActor = newCohortActor("testFailureOnCanCommit"); @@ -153,7 +154,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { resetMockCohort(); askAndAwait(cohortActor, new CanCommit(txId, CANDIDATES, MOCK_SCHEMA, cohortActor)); - verify(mockCohort).canCommit(txId, CANDIDATES, MOCK_SCHEMA); + verify(mockCohort).canCommit(txId, MOCK_SCHEMA, CANDIDATES); } @Test @@ -162,14 +163,14 @@ public class DataTreeCohortActorTest extends AbstractActorTest { TransactionIdentifier txId = nextTransactionId(); askAndAwait(cohortActor, new CanCommit(txId, CANDIDATES, MOCK_SCHEMA, cohortActor)); - verify(mockCohort).canCommit(txId, CANDIDATES, MOCK_SCHEMA); + verify(mockCohort).canCommit(txId, MOCK_SCHEMA, CANDIDATES); askAndAwait(cohortActor, new Abort(txId)); verify(mockPostCanCommit).abort(); resetMockCohort(); askAndAwait(cohortActor, new CanCommit(txId, CANDIDATES, MOCK_SCHEMA, cohortActor)); - verify(mockCohort).canCommit(txId, CANDIDATES, MOCK_SCHEMA); + verify(mockCohort).canCommit(txId, MOCK_SCHEMA, CANDIDATES); } @Test @@ -178,7 +179,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { TransactionIdentifier txId = nextTransactionId(); askAndAwait(cohortActor, new CanCommit(txId, CANDIDATES, MOCK_SCHEMA, cohortActor)); - verify(mockCohort).canCommit(txId, CANDIDATES, MOCK_SCHEMA); + verify(mockCohort).canCommit(txId, MOCK_SCHEMA, CANDIDATES); askAndAwait(cohortActor, new PreCommit(txId)); verify(mockPostCanCommit).preCommit(); @@ -187,15 +188,15 @@ public class DataTreeCohortActorTest extends AbstractActorTest { verify(mockPostPreCommit).abort(); } - private static ListenableFuture executeWithDelay(final ListeningExecutorService executor, final T result) { - return executor.submit(() -> { + private static FluentFuture executeWithDelay(final ListeningExecutorService executor, final T result) { + return FluentFuture.from(executor.submit(() -> { Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS); return result; - }); + })); } private ActorRef newCohortActor(final String name) { - return actorFactory.createActor(DataTreeCohortActor.props(mockCohort, YangInstanceIdentifier.EMPTY), name); + return actorFactory.createActor(DataTreeCohortActor.props(mockCohort, YangInstanceIdentifier.empty()), name); } @SuppressWarnings("unchecked") @@ -203,8 +204,8 @@ public class DataTreeCohortActorTest extends AbstractActorTest { reset(mockCohort); doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostCanCommit).abort(); doReturn(Futures.immediateFuture(mockPostPreCommit)).when(mockPostCanCommit).preCommit(); - doReturn(Futures.immediateCheckedFuture(mockPostCanCommit)).when(mockCohort).canCommit(any(Object.class), - any(Collection.class), any(SchemaContext.class)); + doReturn(FluentFutures.immediateFluentFuture(mockPostCanCommit)).when(mockCohort).canCommit(any(Object.class), + any(SchemaContext.class), any(Collection.class)); doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostPreCommit).abort(); doReturn(Futures.immediateFuture(null)).when(mockPostPreCommit).commit();