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%2FTransactionChainProxyTest.java;h=ed6a731162d58827ca8452fe8edd5aca2df7061e;hb=6313c088fc7db266cc25b691e0cd909300fc8425;hp=8338e7083ab4a64f1c8e7883bdeeec60934a35b5;hpb=c8accd29069c3e7e874949e71ae1518371e660f0;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java index 8338e7083a..ed6a731162 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java @@ -11,7 +11,6 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.doReturn; @@ -21,12 +20,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.opendaylight.controller.cluster.datastore.TransactionType.READ_WRITE; import static org.opendaylight.controller.cluster.datastore.TransactionType.WRITE_ONLY; - import akka.actor.ActorRef; import akka.util.Timeout; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications; @@ -72,7 +71,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { public void testClose() throws Exception { new TransactionChainProxy(mockComponentFactory).close(); - verify(mockActorContext, times(1)).broadcast(anyObject()); + verify(mockActorContext, times(1)).broadcast(any(Function.class)); } @Test @@ -129,7 +128,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { Promise batchedReplyPromise1 = akka.dispatch.Futures.promise(); doReturn(batchedReplyPromise1.future()).when(mockActorContext).executeOperationAsync( - eq(actorSelection(txActorRef1)), isA(BatchedModifications.class)); + eq(actorSelection(txActorRef1)), isA(BatchedModifications.class), any(Timeout.class)); DOMStoreWriteTransaction writeTx1 = txChainProxy.newWriteOnlyTransaction(); @@ -199,7 +198,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { Promise readyReplyPromise1 = akka.dispatch.Futures.promise(); doReturn(readyReplyPromise1.future()).when(mockActorContext).executeOperationAsync( - eq(actorSelection(txActorRef1)), isA(BatchedModifications.class)); + eq(actorSelection(txActorRef1)), isA(BatchedModifications.class), any(Timeout.class)); DOMStoreWriteTransaction writeTx1 = txChainProxy.newReadWriteTransaction();