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

Added more tests for returnAddress and output channel.

Browse Source
This commit is contained in:
Mark Fisher
2008-04-24 11:36:14 +00:00
parent 7d3755c099
commit 9c67c1516f
4 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java
View File

@@ -45,7 +45,7 @@ public class DefaultErrorChannel extends RendezvousChannel {
public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
if (!sent) {
if (logger.isWarnEnabled()) {
logger.warn("DefaultErrorChannel has reached capacity. Are any handlers subscribed?");
logger.warn("Error channel rejected Message. Are any handlers subscribed? " + message);
}
}
}

48
spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java
View File

@@ -34,8 +34,8 @@ public class ReturnAddressTests {
@Test
public void testReturnAddressOverrides() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
"returnAddressOverrides.xml", this.getClass());
MessageChannel channel1 = (MessageChannel) context.getBean("channel1");
"returnAddressTests.xml", this.getClass());
MessageChannel channel1 = (MessageChannel) context.getBean("channel1WithOverride");
MessageChannel replyChannel = (MessageChannel) context.getBean("replyChannel");
context.start();
StringMessage message = new StringMessage("*");
@@ -47,9 +47,9 @@ public class ReturnAddressTests {
}
@Test
public void testReturnAddressIsFallbackByDefault() {
public void testOutputTakesPrecedenceByDefault() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
"returnAddressIsFallbackByDefault.xml", this.getClass());
"returnAddressTests.xml", this.getClass());
MessageChannel channel1 = (MessageChannel) context.getBean("channel1");
MessageChannel replyChannel = (MessageChannel) context.getBean("replyChannel");
context.start();
@@ -61,4 +61,44 @@ public class ReturnAddressTests {
assertEquals("********", response.getPayload());
}
@Test
public void testOutputTakesPrecedenceAndNoReturnAddress() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
"returnAddressTests.xml", this.getClass());
MessageChannel channel4 = (MessageChannel) context.getBean("channel4");
MessageChannel replyChannel = (MessageChannel) context.getBean("replyChannel");
context.start();
StringMessage message = new StringMessage("*");
channel4.send(message);
Message<?> response = replyChannel.receive(1000);
assertNotNull(response);
assertEquals("**", response.getPayload());
}
@Test
public void testReturnAddressFallbackButNotAvailable() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
"returnAddressTests.xml", this.getClass());
MessageChannel channel3 = (MessageChannel) context.getBean("channel3");
MessageChannel errorChannel = (MessageChannel) context.getBean("errorChannel");
context.start();
StringMessage message = new StringMessage("*");
channel3.send(message);
Message<?> errorMessage = errorChannel.receive(1000);
assertNotNull(errorMessage.getPayload());
}
@Test
public void testOutputFallbackButNotAvailable() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
"returnAddressTests.xml", this.getClass());
MessageChannel channel3 = (MessageChannel) context.getBean("channel3WithOverride");
MessageChannel errorChannel = (MessageChannel) context.getBean("errorChannel");
context.start();
StringMessage message = new StringMessage("*");
channel3.send(message);
Message<?> errorMessage = errorChannel.receive(1000);
assertNotNull(errorMessage.getPayload());
}
}

23
spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressIsFallbackByDefault.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
<si:message-bus/>
<si:channel id="channel1"/>
<si:channel id="channel2"/>
<si:channel id="channel3"/>
<si:channel id="replyChannel"/>
<si:endpoint input-channel="channel1" handler="testBean" handler-method="duplicate" default-output-channel="channel2"/>
<si:endpoint input-channel="channel2" handler="testBean" handler-method="duplicate" default-output-channel="channel3"/>
<si:endpoint input-channel="channel3" handler="testBean" handler-method="duplicate"/>
<bean id="testBean" class="org.springframework.integration.endpoint.TestBean"/>
</beans>

13
spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressOverrides.xml → spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
View File

@@ -7,18 +7,27 @@
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
<si:message-bus/>
<si:message-bus error-channel="errorChannel"/>
<si:channel id="channel1"/>
<si:channel id="channel2"/>
<si:channel id="channel3"/>
<si:channel id="channel4"/>
<si:channel id="channel1WithOverride"/>
<si:channel id="channel3WithOverride"/>
<si:channel id="replyChannel"/>
<si:channel id="errorChannel"/>
<si:endpoint input-channel="channel1" handler="testBean" handler-method="duplicate"
<si:endpoint input-channel="channel1WithOverride" handler="testBean" handler-method="duplicate"
default-output-channel="channel2" return-address-overrides="true"/>
<si:endpoint input-channel="channel3WithOverride" handler="testBean" handler-method="duplicate"
return-address-overrides="true"/>
<si:endpoint input-channel="channel1" handler="testBean" handler-method="duplicate" default-output-channel="channel2"/>
<si:endpoint input-channel="channel2" handler="testBean" handler-method="duplicate" default-output-channel="channel3"/>
<si:endpoint input-channel="channel3" handler="testBean" handler-method="duplicate"/>
<si:endpoint input-channel="channel4" handler="testBean" handler-method="duplicate" default-output-channel="replyChannel"/>
<bean id="testBean" class="org.springframework.integration.endpoint.TestBean"/>