Adjust to yangtools-2.0.0 changes

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / databroker / actors / dds / ClientSnapshotTest.java

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 709335cf534e7990f0290e508f67403342ead98a..8162484d7d753f57dcd3a61b7eb422a42687dbf5 100644 (file)
--- 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 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.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;
 
 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<ClientSnapshot>
     @Override
     public void setUp() throws Exception {
         super.setUp();
     @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
     }
 
     @Override


@@ -43,14 +42,14 @@ public class ClientSnapshotTest extends AbstractClientHandleTest<ClientSnapshot>
 
     @Test
     public void testExists() throws Exception {
 
     @Test
     public void testExists() throws Exception {

-        final CheckedFuture<Boolean, ReadFailedException> exists = getHandle().exists(PATH);
+        final ListenableFuture<Boolean> exists = getHandle().exists(PATH);

         verify(getDataTreeSnapshot()).readNode(PATH);
         Assert.assertFalse(getWithTimeout(exists));
     }
 
     @Test
     public void testRead() throws Exception {
         verify(getDataTreeSnapshot()).readNode(PATH);
         Assert.assertFalse(getWithTimeout(exists));
     }
 
     @Test
     public void testRead() throws Exception {

-        final CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> exists = getHandle().read(PATH);
+        final ListenableFuture<Optional<NormalizedNode<?, ?>>> exists = getHandle().read(PATH);

         verify(getDataTreeSnapshot()).readNode(PATH);
         Assert.assertFalse(getWithTimeout(exists).isPresent());
     }
         verify(getDataTreeSnapshot()).readNode(PATH);
         Assert.assertFalse(getWithTimeout(exists).isPresent());
     }