Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-2827 Fix Amqp Gateway Tests

Browse Source 
Use a unique channel for each gateway in
AmqpOutboundGatewayParserTests.
This commit is contained in:
Gary Russell
2012-11-20 18:32:05 -05:00
parent ff039c3ea2
commit 617cc4237c
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml
View File

@@ -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">
<amqp:outbound-gateway id="rabbitGateway" request-channel="toRabbit"
<amqp:outbound-gateway id="rabbitGateway" request-channel="toRabbit0"
reply-channel="fromRabbit"
reply-timeout="777"
exchange-name="si.test.exchange"
@@ -24,13 +24,17 @@
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"/>
</bean>
<int:channel id="toRabbit"/>
<int:channel id="toRabbit0"/>
<int:channel id="toRabbit1"/>
<int:channel id="toRabbit2"/>
<int:channel id="toRabbit3"/>
<int:channel id="toRabbit4"/>
<int:channel id="fromRabbit">
<int:queue/>
</int:channel>
<amqp:outbound-gateway id="withHeaderMapperCustomRequestResponse" request-channel="toRabbit"
<amqp:outbound-gateway id="withHeaderMapperCustomRequestResponse" request-channel="toRabbit1"
reply-channel="fromRabbit"
exchange-name="si.test.exchange"
routing-key="si.test.binding"
@@ -39,7 +43,7 @@
mapped-request-headers="foo*"
mapped-reply-headers="bar*"/>
<amqp:outbound-gateway id="withHeaderMapperCustomAndStandardResponse" request-channel="toRabbit"
<amqp:outbound-gateway id="withHeaderMapperCustomAndStandardResponse" request-channel="toRabbit2"
reply-channel="fromRabbit"
exchange-name="si.test.exchange"
routing-key="si.test.binding"
@@ -48,7 +52,7 @@
mapped-request-headers="foo*"
mapped-reply-headers="bar*, STANDARD_REPLY_HEADERS"/>
<amqp:outbound-gateway id="withHeaderMapperNothingToMap" request-channel="toRabbit"
<amqp:outbound-gateway id="withHeaderMapperNothingToMap" request-channel="toRabbit3"
reply-channel="fromRabbit"
exchange-name="si.test.exchange"
routing-key="si.test.binding"
@@ -65,7 +69,7 @@
<int:queue/>
</int:channel>
<int:chain id="chainWithRabbitOutboundGateway" input-channel="toRabbit" output-channel="fromRabbit">
<int:chain id="chainWithRabbitOutboundGateway" input-channel="toRabbit4" output-channel="fromRabbit">
<amqp:outbound-gateway exchange-name="si.test.exchange"
routing-key="si.test.binding"
amqp-template="amqpTemplate"

8
spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java
View File

@@ -102,7 +102,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("toRabbit1", MessageChannel.class);
Message<?> 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);