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%2Fdatabroker%2FClientBackedReadTransactionTest.java;h=5bb61b0aef859644f3d9eac5ec5bf2dcb066f463;hb=refs%2Fchanges%2F00%2F84600%2F3;hp=2d09073228b6636ef511e3c56670f098bafe735f;hpb=9bce68c4712d00951d121be68b09578bc6e09151;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java index 2d09073228..5bb61b0aef 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java @@ -10,8 +10,9 @@ package org.opendaylight.controller.cluster.databroker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFluentFuture; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateTrueFluentFuture; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.util.Optional; import org.junit.Before; @@ -45,15 +46,15 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest doReturn(CLIENT_ID).when(clientContext).getIdentifier(); doReturn(TRANSACTION_ID).when(delegate).getIdentifier(); - doReturn(Futures.immediateCheckedFuture(Boolean.TRUE)).when(delegate).exists(YangInstanceIdentifier.EMPTY); - doReturn(Futures.immediateCheckedFuture(Optional.of(data))).when(delegate).read(YangInstanceIdentifier.EMPTY); + doReturn(immediateTrueFluentFuture()).when(delegate).exists(YangInstanceIdentifier.empty()); + doReturn(immediateFluentFuture(Optional.of(data))).when(delegate).read(YangInstanceIdentifier.empty()); object = new ClientBackedReadTransaction(delegate, null, null); } @Test public void testRead() throws Exception { - final ListenableFuture>> result = object().read(YangInstanceIdentifier.EMPTY); + final ListenableFuture>> result = object().read(YangInstanceIdentifier.empty()); final Optional> resultData = result.get(); assertTrue(resultData.isPresent()); assertEquals(data, resultData.get()); @@ -61,7 +62,7 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest @Test public void testExists() throws Exception { - final ListenableFuture result = object().exists(YangInstanceIdentifier.EMPTY); + final ListenableFuture result = object().exists(YangInstanceIdentifier.empty()); assertEquals(Boolean.TRUE, result.get()); } }