From a98ce143e20a7e49a58819b64af2d28a16c43315 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 22 Apr 2016 12:33:48 -0400 Subject: [PATCH] Async AMQP Test - Always Get the Ack First --- .../integration/amqp/outbound/AsyncAmqpGatewayTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java index a69a9af9b7..bbb17171b5 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java @@ -163,14 +163,16 @@ public class AsyncAmqpGatewayTests { }); message = MessageBuilder.withPayload("bar").setErrorChannel(errorChannel).build(); gateway.handleMessage(message); - assertNull(errorChannel.receive(100)); ack = ackChannel.receive(10000); assertNotNull(ack); + assertNull(errorChannel.receive(100)); gateway.setRequiresReply(true); message = MessageBuilder.withPayload("baz").setErrorChannel(errorChannel).build(); gateway.handleMessage(message); + ack = ackChannel.receive(10000); + assertNotNull(ack); received = errorChannel.receive(10000); assertThat(received, instanceOf(ErrorMessage.class)); ErrorMessage error = (ErrorMessage) received; @@ -178,8 +180,6 @@ public class AsyncAmqpGatewayTests { assertThat(error.getPayload().getCause(), instanceOf(AmqpReplyTimeoutException.class)); asyncTemplate.setReceiveTimeout(30000); receiver.setMessageListener(messageListener); - ack = ackChannel.receive(10000); - assertNotNull(ack); // error on sending result DirectChannel errorForce = new DirectChannel();