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%2Factors%2Fdds%2FClientTransactionTest.java;fp=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2Factors%2Fdds%2FClientTransactionTest.java;h=9dd5d7b7aaa0f74b5ac8c2defa8239895f3db35a;hb=7e62b4a59f9e43bcd0585845f1aeb55c44199f27;hp=04f706dc66ab045e406feb176859276bbb08d1d5;hpb=698d49f09d9ba58bf400578742a7ac1b06349f11;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java index 04f706dc66..9dd5d7b7aa 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionTest.java @@ -14,16 +14,15 @@ import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtil import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.assertOperationThrowsException; 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.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; +import java.util.Optional; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.controller.cluster.access.commands.CommitLocalTransactionRequest; import org.opendaylight.controller.cluster.access.commands.TransactionCommitSuccess; -import org.opendaylight.mdsal.common.api.ReadFailedException; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; import org.opendaylight.yangtools.yang.common.QName; @@ -78,14 +77,14 @@ public class ClientTransactionTest extends AbstractClientHandleTest exists = getHandle().exists(PATH); + final FluentFuture exists = getHandle().exists(PATH); verify(modification).readNode(PATH); Assert.assertTrue(getWithTimeout(exists)); } @Test public void testRead() throws Exception { - final CheckedFuture>, ReadFailedException> resultFuture = getHandle().read(PATH); + final FluentFuture>> resultFuture = getHandle().read(PATH); verify(modification).readNode(PATH); final Optional> result = getWithTimeout(resultFuture); Assert.assertTrue(result.isPresent()); @@ -138,4 +137,4 @@ public class ClientTransactionTest extends AbstractClientHandleTest