private static final long serialVersionUID = 1L;
MockFailure(final WritableIdentifier target, final RequestException cause) {
- super(target, cause);
+ super(target, 0, cause);
}
@Override
private static final long serialVersionUID = 1L;
MockRequest(final WritableIdentifier target, final ActorRef replyTo) {
- super(target, replyTo);
+ super(target, 0, replyTo);
}
@Override
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);
queue.close();
// Kaboom
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ queue.enqueueRequest(mockRequest, mockCallback);
}
@Test
@Test
public void testPoison() {
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ queue.enqueueRequest(mockRequest, mockCallback);
queue.poison(mockCause);
final ArgumentCaptor<MockFailure> captor = ArgumentCaptor.forClass(MockFailure.class);
queue.poison(mockCause);
// Kaboom
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ queue.enqueueRequest(mockRequest, mockCallback);
}
@Test
@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());
@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);
@Test
public void testSetBackendWithWrongProof() {
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ queue.enqueueRequest(mockRequest, mockCallback);
final CompletableFuture<BackendInfo> proof = new CompletableFuture<>();
assertTrue(queue.expectProof(proof));
}
@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));
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);
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);
}
@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);
@Test
public void testRunTimeoutWithTimeoutExact() throws NoProgressException {
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ setupBackend();
+
+ queue.enqueueRequest(mockRequest, mockCallback);
ticker.increment(SequencedQueue.REQUEST_TIMEOUT_NANOS);
@Test
public void testRunTimeoutWithTimeoutMore() throws NoProgressException {
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ setupBackend();
+
+ queue.enqueueRequest(mockRequest, mockCallback);
ticker.increment(SequencedQueue.REQUEST_TIMEOUT_NANOS + 1);
@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);
@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);
@Test
public void testCompleteSingle() {
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ setupBackend();
+
+ queue.enqueueRequest(mockRequest, mockCallback);
ClientActorBehavior ret = queue.complete(mockBehavior, mockResponseEnvelope);
verify(mockCallback).complete(mockResponse);
@Test
public void testCompleteNull() {
- queue.enqueueRequest(0, mockRequest, mockCallback);
+ setupBackend();
+
+ queue.enqueueRequest(mockRequest, mockCallback);
doReturn(null).when(mockCallback).complete(mockResponse);
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);
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());
}
}