BUG-5280: separate request sequence and transmit sequence

[controller.git] / opendaylight / md-sal / cds-access-client / src / test / java / org / opendaylight / controller / cluster / access / client / SequencedQueueTest.java

diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/SequencedQueueTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/SequencedQueueTest.java
index b05ca3a7e00029da66ef2efc57373cafb1e2ed56..fb92de9351e4bff3d9a529ebc5158ebc327e856d 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/SequencedQueueTest.java
+++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/SequencedQueueTest.java
@@ -54,7 +54,7 @@ public class SequencedQueueTest {
         private static final long serialVersionUID = 1L;
 
         MockFailure(final WritableIdentifier target, final RequestException cause) {
-            super(target, cause);
+            super(target, 0, cause);
         }
 
         @Override
@@ -72,7 +72,7 @@ public class SequencedQueueTest {
         private static final long serialVersionUID = 1L;
 
         MockRequest(final WritableIdentifier target, final ActorRef replyTo) {
-            super(target, replyTo);
+            super(target, 0, replyTo);
         }
 
         @Override
@@ -135,7 +135,7 @@ public class SequencedQueueTest {
         ticker.increment(ThreadLocalRandom.current().nextLong());
 
         mockActor = TestProbe.apply(actorSystem);
-        mockBackendInfo = new BackendInfo(mockActor.ref(), ABIVersion.current());
+        mockBackendInfo = new BackendInfo(mockActor.ref(), 0, ABIVersion.current(), 5);
         mockRequest = new MockRequest(mockIdentifier, mockReplyTo);
         mockRequest2 = new MockRequest(mockIdentifier, mockReplyTo);
         mockResponse = mockRequest.toRequestFailure(mockCause);
@@ -167,7 +167,7 @@ public class SequencedQueueTest {
         queue.close();
 
         // Kaboom
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
     }
 
     @Test
@@ -178,7 +178,7 @@ public class SequencedQueueTest {
 
     @Test
     public void testPoison() {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
         queue.poison(mockCause);
 
         final ArgumentCaptor<MockFailure> captor = ArgumentCaptor.forClass(MockFailure.class);
@@ -192,7 +192,7 @@ public class SequencedQueueTest {
         queue.poison(mockCause);
 
         // Kaboom
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
     }
 
     @Test
@@ -203,7 +203,7 @@ public class SequencedQueueTest {
 
     @Test
     public void testEnqueueRequestNeedsBackend() {
-        final Optional<FiniteDuration> ret = queue.enqueueRequest(0, mockRequest, mockCallback);
+        final Optional<FiniteDuration> ret = queue.enqueueRequest(mockRequest, mockCallback);
 
         assertNotNull(ret);
         assertFalse(ret.isPresent());
@@ -225,7 +225,7 @@ public class SequencedQueueTest {
 
     @Test
     public void testSetBackendWithNoResolution() {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         final CompletableFuture<BackendInfo> proof = new CompletableFuture<>();
         final Optional<FiniteDuration> ret = queue.setBackendInfo(proof, mockBackendInfo);
@@ -235,7 +235,7 @@ public class SequencedQueueTest {
 
     @Test
     public void testSetBackendWithWrongProof() {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         final CompletableFuture<BackendInfo> proof = new CompletableFuture<>();
         assertTrue(queue.expectProof(proof));
@@ -252,8 +252,8 @@ public class SequencedQueueTest {
     }
 
     @Test
-    public void testSetbackedWithRequestsNoTimer() {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+    public void testSetBackendWithRequestsNoTimer() {
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         final CompletableFuture<BackendInfo> proof = new CompletableFuture<>();
         assertTrue(queue.expectProof(proof));
@@ -270,7 +270,7 @@ public class SequencedQueueTest {
     public void testEnqueueRequestNeedsTimer() {
         setupBackend();
 
-        final Optional<FiniteDuration> ret = queue.enqueueRequest(0, mockRequest, mockCallback);
+        final Optional<FiniteDuration> ret = queue.enqueueRequest(mockRequest, mockCallback);
         assertNotNull(ret);
         assertTrue(ret.isPresent());
         assertTransmit(mockRequest, 0);
@@ -281,13 +281,13 @@ public class SequencedQueueTest {
         setupBackend();
 
         // First request
-        Optional<FiniteDuration> ret = queue.enqueueRequest(0, mockRequest, mockCallback);
+        Optional<FiniteDuration> ret = queue.enqueueRequest(mockRequest, mockCallback);
         assertNotNull(ret);
         assertTrue(ret.isPresent());
         assertTransmit(mockRequest, 0);
 
         // Second request, no timer fired
-        ret = queue.enqueueRequest(1, mockRequest2, mockCallback);
+        ret = queue.enqueueRequest(mockRequest2, mockCallback);
         assertNull(ret);
         assertTransmit(mockRequest2, 1);
     }
@@ -300,14 +300,14 @@ public class SequencedQueueTest {
 
     @Test
     public void testRunTimeoutWithoutShift() throws NoProgressException {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
         final boolean ret = queue.runTimeout();
         assertFalse(ret);
     }
 
     @Test
     public void testRunTimeoutWithTimeoutLess() throws NoProgressException {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         ticker.increment(SequencedQueue.REQUEST_TIMEOUT_NANOS - 1);
 
@@ -317,7 +317,9 @@ public class SequencedQueueTest {
 
     @Test
     public void testRunTimeoutWithTimeoutExact() throws NoProgressException {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        setupBackend();
+
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         ticker.increment(SequencedQueue.REQUEST_TIMEOUT_NANOS);
 
@@ -327,7 +329,9 @@ public class SequencedQueueTest {
 
     @Test
     public void testRunTimeoutWithTimeoutMore() throws NoProgressException {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        setupBackend();
+
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         ticker.increment(SequencedQueue.REQUEST_TIMEOUT_NANOS + 1);
 
@@ -337,7 +341,7 @@ public class SequencedQueueTest {
 
     @Test(expected=NoProgressException.class)
     public void testRunTimeoutWithoutProgressExact() throws NoProgressException {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         ticker.increment(SequencedQueue.NO_PROGRESS_TIMEOUT_NANOS);
 
@@ -347,7 +351,7 @@ public class SequencedQueueTest {
 
     @Test(expected=NoProgressException.class)
     public void testRunTimeoutWithoutProgressMore() throws NoProgressException {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         ticker.increment(SequencedQueue.NO_PROGRESS_TIMEOUT_NANOS + 1);
 
@@ -382,7 +386,9 @@ public class SequencedQueueTest {
 
     @Test
     public void testCompleteSingle() {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        setupBackend();
+
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         ClientActorBehavior ret = queue.complete(mockBehavior, mockResponseEnvelope);
         verify(mockCallback).complete(mockResponse);
@@ -395,7 +401,9 @@ public class SequencedQueueTest {
 
     @Test
     public void testCompleteNull() {
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        setupBackend();
+
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         doReturn(null).when(mockCallback).complete(mockResponse);
 
@@ -408,10 +416,10 @@ public class SequencedQueueTest {
     public void testProgressRecord() throws NoProgressException {
         setupBackend();
 
-        queue.enqueueRequest(0, mockRequest, mockCallback);
+        queue.enqueueRequest(mockRequest, mockCallback);
 
         ticker.increment(10);
-        queue.enqueueRequest(1, mockRequest2, mockCallback);
+        queue.enqueueRequest(mockRequest2, mockCallback);
         queue.complete(mockBehavior, mockResponseEnvelope);
 
         ticker.increment(SequencedQueue.NO_PROGRESS_TIMEOUT_NANOS - 11);
@@ -436,8 +444,8 @@ public class SequencedQueueTest {
         assertTrue(o instanceof RequestEnvelope);
 
         final RequestEnvelope actual = (RequestEnvelope) o;
-        assertEquals(0, actual.getRetry());
-        assertEquals(sequence, actual.getSequence());
+        assertEquals(0, actual.getSessionId());
+        assertEquals(sequence, actual.getTxSequence());
         assertSame(expected, actual.getMessage());
     }
 }