From 617cc4237c98954753cf49f1d5ca5e56ed29aa07 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 20 Nov 2012 18:32:05 -0500 Subject: [PATCH] INT-2827 Fix Amqp Gateway Tests Use a unique channel for each gateway in AmqpOutboundGatewayParserTests. --- .../AmqpOutboundGatewayParserTests-context.xml | 16 ++++++++++------ .../config/AmqpOutboundGatewayParserTests.java | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml index 7b1e716385..63ec21901b 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - + + + + + - - - - + message = MessageBuilder.withPayload("hello").setHeader("foo", "foo").build(); requestChannel.send(message); @@ -149,7 +149,7 @@ public class AmqpOutboundGatewayParserTests { .when(amqpTemplate).sendAndReceive(Mockito.any(String.class), Mockito.any(String.class), Mockito.any(org.springframework.amqp.core.Message.class)); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); - MessageChannel requestChannel = context.getBean("toRabbit", MessageChannel.class); + MessageChannel requestChannel = context.getBean("toRabbit2", MessageChannel.class); Message message = MessageBuilder.withPayload("hello").setHeader("foo", "foo").build(); requestChannel.send(message); @@ -196,7 +196,7 @@ public class AmqpOutboundGatewayParserTests { .when(amqpTemplate).sendAndReceive(Mockito.any(String.class), Mockito.any(String.class), Mockito.any(org.springframework.amqp.core.Message.class)); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); - MessageChannel requestChannel = context.getBean("toRabbit", MessageChannel.class); + MessageChannel requestChannel = context.getBean("toRabbit3", MessageChannel.class); Message message = MessageBuilder.withPayload("hello").setHeader("foo", "foo").build(); requestChannel.send(message); @@ -245,7 +245,7 @@ public class AmqpOutboundGatewayParserTests { ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); - MessageChannel requestChannel = context.getBean("toRabbit", MessageChannel.class); + MessageChannel requestChannel = context.getBean("toRabbit4", MessageChannel.class); Message message = MessageBuilder.withPayload("hello").setHeader("foo", "foo").build(); requestChannel.send(message);