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 bbb17171b5..b09359067d 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,16 +163,12 @@ public class AsyncAmqpGatewayTests { }); message = MessageBuilder.withPayload("bar").setErrorChannel(errorChannel).build(); gateway.handleMessage(message); - 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; @@ -208,6 +204,8 @@ public class AsyncAmqpGatewayTests { assertNotNull(returned); assertEquals("fiz", returned.getPayload()); + ackChannel.purge(null); + // Simulate a nack - it's hard to get Rabbit to generate one // We must have consumed all the real acks by now, though, to prevent partial stubbing errors