X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-client%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fclient%2FAbstractTransmitQueueTest.java;h=3800da865aabef86be1710c7fdf24f1b694a8766;hp=b5f1bdac7e6a01f9d0d8eeb18d53609998b1b958;hb=90c86de54d7bf10bfb9ffb0a8ad6a818aeecc895;hpb=730ff1686220fca0176a8757b4444d63ab2afc44 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..3800da865a 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 @@ -79,7 +79,7 @@ public abstract class AbstractTransmitQueueTest { 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 entries = queue.drain(); Assert.assertEquals(sentMessages, entries.size()); @@ -100,7 +100,7 @@ public abstract class AbstractTransmitQueueTest { final Request request = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, requestSequence, probe.ref()); final Consumer> 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 { final Request request = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, 0L, probe.ref()); final Consumer> 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 { 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 { final Request request = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, 0L, probe.ref()); final Consumer> 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());