X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-client%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fclient%2FAbstractTransmitQueueTest.java;h=464acdcea8887f5cb37dff931af21f2024e5d6b9;hb=refs%2Fchanges%2F22%2F65622%2F11;hp=b5f1bdac7e6a01f9d0d8eeb18d53609998b1b958;hpb=b74c6012092e47430a8f4d6f4ddeb1d3e2b1b7df;p=controller.git

diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractTransmitQueueTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractTransmitQueueTest.java
index b5f1bdac7e..464acdcea8 100644
--- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractTransmitQueueTest.java
+++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractTransmitQueueTest.java
@@ -14,8 +14,8 @@ import static org.mockito.Mockito.verify;
 import static org.opendaylight.controller.cluster.access.client.ConnectionEntryMatcher.entryWithRequest;
 
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestProbe;
+import akka.testkit.javadsl.TestKit;
 import com.google.common.base.Ticker;
 import java.util.Collection;
 import java.util.Optional;
@@ -63,7 +63,7 @@ public abstract class AbstractTransmitQueueTest<T extends TransmitQueue> {
 
     @After
     public void tearDown() throws Exception {
-        JavaTestKit.shutdownActorSystem(system);
+        TestKit.shutdownActorSystem(system);
     }
 
     @Test
@@ -79,7 +79,7 @@ public abstract class AbstractTransmitQueueTest<T extends TransmitQueue> {
         final long now = Ticker.systemTicker().read();
         final int sentMessages = getMaxInFlightMessages() + 1;
         for (int i = 0; i < sentMessages; i++) {
-            queue.enqueue(new ConnectionEntry(request, callback, now), now);
+            queue.enqueueOrForward(new ConnectionEntry(request, callback, now), now);
         }
         final Collection<ConnectionEntry> entries = queue.drain();
         Assert.assertEquals(sentMessages, entries.size());
@@ -100,7 +100,7 @@ public abstract class AbstractTransmitQueueTest<T extends TransmitQueue> {
         final Request<?, ?> request = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, requestSequence, probe.ref());
         final Consumer<Response<?, ?>> callback = createConsumerMock();
         final long now = Ticker.systemTicker().read();
-        queue.enqueue(new ConnectionEntry(request, callback, now), now);
+        queue.enqueueOrForward(new ConnectionEntry(request, callback, now), now);
         //different transaction id
         final TransactionIdentifier anotherTxId = new TransactionIdentifier(HISTORY, 1L);
         final RequestSuccess<?, ?> success1 = new TransactionPurgeResponse(anotherTxId, requestSequence);
@@ -136,7 +136,7 @@ public abstract class AbstractTransmitQueueTest<T extends TransmitQueue> {
         final Request<?, ?> request = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, 0L, probe.ref());
         final Consumer<Response<?, ?>> callback = createConsumerMock();
         final long now = Ticker.systemTicker().read();
-        queue.enqueue(new ConnectionEntry(request, callback, now), now);
+        queue.enqueueOrForward(new ConnectionEntry(request, callback, now), now);
         Assert.assertFalse(queue.isEmpty());
     }
 
@@ -148,8 +148,8 @@ public abstract class AbstractTransmitQueueTest<T extends TransmitQueue> {
         final long now = Ticker.systemTicker().read();
         final ConnectionEntry entry1 = new ConnectionEntry(request1, callback, now);
         final ConnectionEntry entry2 = new ConnectionEntry(request2, callback, now);
-        queue.enqueue(entry1, now);
-        queue.enqueue(entry2, now);
+        queue.enqueueOrForward(entry1, now);
+        queue.enqueueOrForward(entry2, now);
         Assert.assertEquals(entry1.getRequest(), queue.peek().getRequest());
     }
 
@@ -158,7 +158,7 @@ public abstract class AbstractTransmitQueueTest<T extends TransmitQueue> {
         final Request<?, ?> request = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, 0L, probe.ref());
         final Consumer<Response<?, ?>> callback = createConsumerMock();
         final long now = Ticker.systemTicker().read();
-        queue.enqueue(new ConnectionEntry(request, callback, now), now);
+        queue.enqueueOrForward(new ConnectionEntry(request, callback, now), now);
         queue.poison(new RuntimeRequestException("fail", new RuntimeException("fail")));
         verify(callback).accept(any(TransactionFailure.class));
         Assert.assertTrue(queue.isEmpty());