X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDataTreeCohortActorTest.java;h=83bf284d7cbfe4b9e6eabc1b5c0cc0bebfe6669e;hb=5fa5244653ee7ad3042324fb1f21fad69581b3d2;hp=b1b3ff4b2742075c5ca2cc0f4e009dfc13232f6b;hpb=30bf4ce61e67ca32a2132a1eaed213a02f247ac4;p=controller.git 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 b1b3ff4b27..83bf284d7c 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 @@ -18,14 +18,13 @@ 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.JdkFutureAdapters; -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; import java.util.ArrayList; import java.util.Collection; -import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.junit.After; @@ -44,6 +43,7 @@ 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.model.api.SchemaContext; @@ -78,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(); @@ -88,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 @@ -111,23 +111,20 @@ public class DataTreeCohortActorTest extends AbstractActorTest { @SuppressWarnings("unchecked") @Test public void testAsyncCohort() throws Exception { - ExecutorService executor = Executors.newSingleThreadExecutor(); + 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(JdkFutureAdapters.listenInPoolThread(executor.submit(() -> - mockPostPreCommit), MoreExecutors.directExecutor())).when(mockPostCanCommit).preCommit(); + doReturn(executor.submit(() -> mockPostPreCommit)).when(mockPostCanCommit).preCommit(); - doReturn(JdkFutureAdapters.listenInPoolThread(executor.submit(() -> - null), MoreExecutors.directExecutor())).when(mockPostPreCommit).commit(); + doReturn(executor.submit(() -> null)).when(mockPostPreCommit).commit(); ActorRef cohortActor = newCohortActor("testAsyncCohort"); 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(); @@ -142,8 +139,8 @@ public class DataTreeCohortActorTest extends AbstractActorTest { @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)); + doReturn(FluentFutures.immediateFailedFluentFuture(failure)).when(mockCohort).canCommit(any(Object.class), + any(SchemaContext.class), any(Collection.class)); ActorRef cohortActor = newCohortActor("testFailureOnCanCommit"); @@ -156,7 +153,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 @@ -165,14 +162,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 @@ -181,7 +178,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(); @@ -190,14 +187,14 @@ public class DataTreeCohortActorTest extends AbstractActorTest { verify(mockPostPreCommit).abort(); } - private ListenableFuture executeWithDelay(ExecutorService executor, T result) { - return JdkFutureAdapters.listenInPoolThread(executor.submit(() -> { + private static FluentFuture executeWithDelay(final ListeningExecutorService executor, final T result) { + return FluentFuture.from(executor.submit(() -> { Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS); return result; - }), MoreExecutors.directExecutor()); + })); } - private ActorRef newCohortActor(String name) { + private ActorRef newCohortActor(final String name) { return actorFactory.createActor(DataTreeCohortActor.props(mockCohort, YangInstanceIdentifier.EMPTY), name); } @@ -206,14 +203,14 @@ 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(); } - private static void askAndAwait(ActorRef actor, CommitProtocolCommand message) throws Exception { + private static void askAndAwait(final ActorRef actor, final CommitProtocolCommand message) throws Exception { Timeout timeout = new Timeout(5, TimeUnit.SECONDS); Object result = Await.result(Patterns.ask(actor, message, timeout), timeout.duration()); assertTrue("Expected Success but was " + result, result instanceof Success);