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%2Fdatabroker%2Factors%2Fdds%2FClientSnapshotTest.java;h=8162484d7d753f57dcd3a61b7eb422a42687dbf5;hp=709335cf534e7990f0290e508f67403342ead98a;hb=20a32e6459fd1e27e7669bf1ebc7742b96787b94;hpb=ddb42663a4a53d8440d33f955a5944184f3b602d diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java index 709335cf53..8162484d7d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientSnapshotTest.java @@ -12,11 +12,10 @@ import static org.mockito.Mockito.when; import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.getWithTimeout; import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.ListenableFuture; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.common.api.ReadFailedException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -28,7 +27,7 @@ public class ClientSnapshotTest extends AbstractClientHandleTest @Override public void setUp() throws Exception { super.setUp(); - when(getDataTreeSnapshot().readNode(PATH)).thenReturn(Optional.absent()); + when(getDataTreeSnapshot().readNode(PATH)).thenReturn(java.util.Optional.empty()); } @Override @@ -43,14 +42,14 @@ public class ClientSnapshotTest extends AbstractClientHandleTest @Test public void testExists() throws Exception { - final CheckedFuture exists = getHandle().exists(PATH); + final ListenableFuture exists = getHandle().exists(PATH); verify(getDataTreeSnapshot()).readNode(PATH); Assert.assertFalse(getWithTimeout(exists)); } @Test public void testRead() throws Exception { - final CheckedFuture>, ReadFailedException> exists = getHandle().read(PATH); + final ListenableFuture>> exists = getHandle().read(PATH); verify(getDataTreeSnapshot()).readNode(PATH); Assert.assertFalse(getWithTimeout(exists).isPresent()); }