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%2FRemoteProxyTransactionTest.java;h=e159cf02d975cff85a7dc28f5358109242388914;hp=9d6122f65332bb024172a21272744b131b157175;hb=7e62b4a59f9e43bcd0585845f1aeb55c44199f27;hpb=df34f194596eed9494f64a691bec244be70c2a5e

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java
index 9d6122f653..e159cf02d9 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransactionTest.java
@@ -13,10 +13,10 @@ import static org.hamcrest.CoreMatchers.isA;
 import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.assertFutureEquals;
 
 import akka.testkit.TestProbe;
-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.List;
+import java.util.Optional;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.access.commands.ExistsTransactionRequest;
@@ -37,7 +37,6 @@ import org.opendaylight.controller.cluster.access.commands.TransactionPreCommitR
 import org.opendaylight.controller.cluster.access.commands.TransactionPreCommitSuccess;
 import org.opendaylight.controller.cluster.access.commands.TransactionWrite;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
-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.schema.tree.DataTreeSnapshot;
@@ -47,14 +46,14 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
     @Override
     protected RemoteProxyTransaction createTransaction(final ProxyHistory parent, final TransactionIdentifier id,
                                                        final DataTreeSnapshot snapshot) {
-        return new RemoteProxyTransaction(parent, TRANSACTION_ID, false, false);
+        return new RemoteProxyTransaction(parent, TRANSACTION_ID, false, false, false);
     }
 
     @Override
     @Test
     public void testExists() throws Exception {
         final TransactionTester<RemoteProxyTransaction> tester = getTester();
-        final CheckedFuture<Boolean, ReadFailedException> exists = transaction.exists(PATH_1);
+        final FluentFuture<Boolean> exists = transaction.exists(PATH_1);
         final ExistsTransactionRequest req = tester.expectTransactionRequest(ExistsTransactionRequest.class);
         final boolean existsResult = true;
         tester.replySuccess(new ExistsTransactionSuccess(TRANSACTION_ID, req.getSequence(), existsResult));
@@ -65,7 +64,7 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
     @Test
     public void testRead() throws Exception {
         final TransactionTester<RemoteProxyTransaction> tester = getTester();
-        final CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read = transaction.read(PATH_2);
+        final FluentFuture<Optional<NormalizedNode<?, ?>>> read = transaction.read(PATH_2);
         final ReadTransactionRequest req = tester.expectTransactionRequest(ReadTransactionRequest.class);
         final Optional<NormalizedNode<?, ?>> result = Optional.of(DATA_1);
         tester.replySuccess(new ReadTransactionSuccess(TRANSACTION_ID, req.getSequence(), result));
@@ -178,8 +177,10 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         builder.setSequence(0L);
         builder.setAbort();
         final ModifyTransactionRequest request = builder.build();
-        final TransactionAbortRequest received = testForwardToRemote(request, TransactionAbortRequest.class);
+        final ModifyTransactionRequest received = testForwardToRemote(request, ModifyTransactionRequest.class);
         Assert.assertEquals(request.getTarget(), received.getTarget());
+        Assert.assertTrue(received.getPersistenceProtocol().isPresent());
+        Assert.assertEquals(PersistenceProtocol.ABORT, received.getPersistenceProtocol().get());
     }
 
     @Test
@@ -231,4 +232,4 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         Assert.assertThat(modifications, hasItem(both(isA(cls)).and(hasPath(expectedPath))));
     }
 
-}
\ No newline at end of file
+}