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%2FRemoteProxyTransactionTest.java;h=41847973fb04f6532b6b9d25dbbc3cf38eee86e9;hb=HEAD;hp=2731b7d315700a6af8d032161325ce77e56ea755;hpb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;p=controller.git

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 2731b7d315..41847973fb 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
@@ -10,6 +10,8 @@ package org.opendaylight.controller.cluster.databroker.actors.dds;
 import static org.hamcrest.CoreMatchers.both;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.isA;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.assertFutureEquals;
 
 import akka.testkit.TestProbe;
@@ -17,7 +19,6 @@ 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;
 import org.opendaylight.controller.cluster.access.commands.ExistsTransactionSuccess;
@@ -39,13 +40,13 @@ import org.opendaylight.controller.cluster.access.commands.TransactionWrite;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 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;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshot;
 
 public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<RemoteProxyTransaction> {
-
     @Override
     protected RemoteProxyTransaction createTransaction(final ProxyHistory parent, final TransactionIdentifier id,
                                                        final DataTreeSnapshot snapshot) {
+        mockForRemote();
         return new RemoteProxyTransaction(parent, TRANSACTION_ID, false, false, false);
     }
 
@@ -64,9 +65,9 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
     @Test
     public void testRead() throws Exception {
         final TransactionTester<RemoteProxyTransaction> tester = getTester();
-        final FluentFuture<Optional<NormalizedNode<?, ?>>> 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);
+        final Optional<NormalizedNode> result = Optional.of(DATA_1);
         tester.replySuccess(new ReadTransactionSuccess(TRANSACTION_ID, req.getSequence(), result));
         assertFutureEquals(result, read);
     }
@@ -99,8 +100,7 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         final ListenableFuture<Boolean> result = transaction.directCommit();
         final TransactionTester<RemoteProxyTransaction> tester = getTester();
         final ModifyTransactionRequest req = tester.expectTransactionRequest(ModifyTransactionRequest.class);
-        Assert.assertTrue(req.getPersistenceProtocol().isPresent());
-        Assert.assertEquals(PersistenceProtocol.SIMPLE, req.getPersistenceProtocol().get());
+        assertEquals(Optional.of(PersistenceProtocol.SIMPLE), req.getPersistenceProtocol());
         tester.replySuccess(new TransactionCommitSuccess(TRANSACTION_ID, req.getSequence()));
         assertFutureEquals(true, result);
     }
@@ -150,9 +150,9 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         builder.setCommit(false);
         final ModifyTransactionRequest request = builder.build();
         final ModifyTransactionRequest received = testForwardToRemote(request, ModifyTransactionRequest.class);
-        Assert.assertEquals(request.getPersistenceProtocol(), received.getPersistenceProtocol());
-        Assert.assertEquals(request.getModifications(), received.getModifications());
-        Assert.assertEquals(request.getTarget(), received.getTarget());
+        assertEquals(request.getPersistenceProtocol(), received.getPersistenceProtocol());
+        assertEquals(request.getModifications(), received.getModifications());
+        assertEquals(request.getTarget(), received.getTarget());
     }
 
     @Test
@@ -164,9 +164,9 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         builder.setCommit(true);
         final ModifyTransactionRequest request = builder.build();
         final ModifyTransactionRequest received = testForwardToRemote(request, ModifyTransactionRequest.class);
-        Assert.assertEquals(request.getPersistenceProtocol(), received.getPersistenceProtocol());
-        Assert.assertEquals(request.getModifications(), received.getModifications());
-        Assert.assertEquals(request.getTarget(), received.getTarget());
+        assertEquals(request.getPersistenceProtocol(), received.getPersistenceProtocol());
+        assertEquals(request.getModifications(), received.getModifications());
+        assertEquals(request.getTarget(), received.getTarget());
     }
 
     @Test
@@ -178,9 +178,8 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         builder.setAbort();
         final ModifyTransactionRequest request = builder.build();
         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());
+        assertEquals(request.getTarget(), received.getTarget());
+        assertEquals(Optional.of(PersistenceProtocol.ABORT), received.getPersistenceProtocol());
     }
 
     @Test
@@ -189,8 +188,8 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         final ReadTransactionRequest request =
                 new ReadTransactionRequest(TRANSACTION_ID, 0L, probe.ref(), PATH_1, false);
         final ReadTransactionRequest received = testForwardToRemote(request, ReadTransactionRequest.class);
-        Assert.assertEquals(request.getTarget(), received.getTarget());
-        Assert.assertEquals(request.getPath(), received.getPath());
+        assertEquals(request.getTarget(), received.getTarget());
+        assertEquals(request.getPath(), received.getPath());
     }
 
     @Test
@@ -199,8 +198,8 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         final ExistsTransactionRequest request =
                 new ExistsTransactionRequest(TRANSACTION_ID, 0L, probe.ref(), PATH_1, false);
         final ExistsTransactionRequest received = testForwardToRemote(request, ExistsTransactionRequest.class);
-        Assert.assertEquals(request.getTarget(), received.getTarget());
-        Assert.assertEquals(request.getPath(), received.getPath());
+        assertEquals(request.getTarget(), received.getTarget());
+        assertEquals(request.getPath(), received.getPath());
     }
 
     @Test
@@ -209,7 +208,7 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         final TransactionPreCommitRequest request =
                 new TransactionPreCommitRequest(TRANSACTION_ID, 0L, probe.ref());
         final TransactionPreCommitRequest received = testForwardToRemote(request, TransactionPreCommitRequest.class);
-        Assert.assertEquals(request.getTarget(), received.getTarget());
+        assertEquals(request.getTarget(), received.getTarget());
     }
 
     @Test
@@ -218,18 +217,16 @@ public class RemoteProxyTransactionTest extends AbstractProxyTransactionTest<Rem
         final TransactionDoCommitRequest request =
                 new TransactionDoCommitRequest(TRANSACTION_ID, 0L, probe.ref());
         final TransactionDoCommitRequest received = testForwardToRemote(request, TransactionDoCommitRequest.class);
-        Assert.assertEquals(request.getTarget(), received.getTarget());
+        assertEquals(request.getTarget(), received.getTarget());
     }
 
 
-    private <T extends TransactionModification> void testModification(final Runnable modification,
-                                                                      final Class<T> cls,
-                                                                      final YangInstanceIdentifier expectedPath) {
+    private <T extends TransactionModification> void testModification(final Runnable modification, final Class<T> cls,
+            final YangInstanceIdentifier expectedPath) {
         modification.run();
         final ModifyTransactionRequest request = transaction.commitRequest(false);
         final List<TransactionModification> modifications = request.getModifications();
-        Assert.assertEquals(1, modifications.size());
-        Assert.assertThat(modifications, hasItem(both(isA(cls)).and(hasPath(expectedPath))));
+        assertEquals(1, modifications.size());
+        assertThat(modifications, hasItem(both(isA(cls)).and(hasPath(expectedPath))));
     }
-
 }