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

INT-2188 and INT-2165

Browse Source 
add fail test for HeaderEnricherSupport

  more flexible and readable parsing for sub-elements of <si:header>
This commit is contained in:
Artem Bilan
2011-11-01 14:19:37 +02:00
committed by Mark Fisher
parent 646bc72615
commit 869bcd5d36
6 changed files with 176 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd">
<header-enricher input-channel="replyChannelInput" output-channel="echoInput">
<header-enricher input-channel="replyChannelInput" output-channel="echoInput">
<reply-channel ref="testReplyChannel"/>
</header-enricher>
@@ -33,15 +33,15 @@
</channel>
<header-enricher input-channel="correlationIdValueInput">
<correlation-id value="ABC"/>
<correlation-id value="ABC"/>
</header-enricher>
<header-enricher input-channel="correlationIdValueWithTypeInput">
<correlation-id value="123" type="java.lang.Long"/>
<correlation-id value="123" type="java.lang.Long"/>
</header-enricher>
<header-enricher input-channel="correlationIdRefInput">
<correlation-id ref="testCorrelationId"/>
<correlation-id ref="testCorrelationId"/>
</header-enricher>
<beans:bean id="testCorrelationId" class="java.lang.Integer">
@@ -84,8 +84,32 @@
<header name="testHeader" ref="testBean" method="getName"/>
</header-enricher>
<header-enricher input-channel="ref">
<header name="testHeader" ref="testBean1"/>
</header-enricher>
<header-enricher input-channel="innerBean">
<header name="testHeader">
<beans:bean class="org.springframework.integration.config.xml.HeaderEnricherTests$TestBean">
<beans:constructor-arg value="testBeanForInnerBean"/>
</beans:bean>
</header>
</header-enricher>
<header-enricher input-channel="innerBeanWithMethod">
<header name="testHeader" method="getName">
<beans:bean class="org.springframework.integration.config.xml.HeaderEnricherTests$TestBean">
<beans:constructor-arg value="testBeanForInnerBeanWithMethod"/>
</beans:bean>
</header>
</header-enricher>
<beans:bean id="testBean" class="org.springframework.integration.config.xml.HeaderEnricherTests$TestBean">
<beans:constructor-arg value="testBeanForMethodInvoker"/>
</beans:bean>
<beans:bean id="testBean1" class="org.springframework.integration.config.xml.HeaderEnricherTests$TestBean">
<beans:constructor-arg value="testBeanForRef"/>
</beans:bean>
</beans:beans>

62
spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java
View File

@@ -16,17 +16,15 @@
package org.springframework.integration.config.xml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.Date;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.core.MessagingTemplate;
@@ -37,8 +35,11 @@ import org.springframework.integration.transformer.MessageTransformationExceptio
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.junit.Assert.*;
/**
* @author Mark Fisher
* @author Artem Bilan
* @since 2.0
*/
@ContextConfiguration
@@ -180,6 +181,42 @@ public class HeaderEnricherTests {
assertEquals("testBeanForMethodInvoker", result.getHeaders().get("testHeader"));
}
@Test
public void ref() {
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("ref", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
assertEquals(TestBean.class, result.getHeaders().get("testHeader").getClass());
TestBean testBeanForRef = context.getBean("testBean1", TestBean.class);
assertSame(testBeanForRef, result.getHeaders().get("testHeader"));
}
@Test
public void innerBean() {
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("innerBean", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
assertEquals(TestBean.class, result.getHeaders().get("testHeader").getClass());
TestBean testBeanForInnerBean = new TestBean("testBeanForInnerBean");
assertEquals(testBeanForInnerBean, result.getHeaders().get("testHeader"));
}
@Test
public void innerBeanWithMethod() {
MessagingTemplate template = new MessagingTemplate();
MessageChannel channel = context.getBean("innerBeanWithMethod", MessageChannel.class);
Message<?> result = template.sendAndReceive(channel, new GenericMessage<String>("test"));
assertNotNull(result);
assertEquals(String.class, result.getHeaders().get("testHeader").getClass());
assertEquals("testBeanForInnerBeanWithMethod", result.getHeaders().get("testHeader"));
}
@Test(expected = BeanDefinitionParsingException.class)
public void testFailConfigUnexpectedSubElement() {
new ClassPathXmlApplicationContext("HeaderEnricherWithUnexpectedSubElementForHeader-fail-context.xml", this.getClass());
}
public static class TestBean {
@@ -192,6 +229,23 @@ public class HeaderEnricherTests {
public String getName() {
return this.name;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TestBean testBean = (TestBean) o;
if (name != null ? !name.equals(testBean.name) : testBean.name != null) return false;
return true;
}
@Override
public int hashCode() {
return name != null ? name.hashCode() : 0;
}
}
}

21
spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherWithUnexpectedSubElementForHeader-fail-context.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd">
<header-enricher>
<header name="testHeader">
<beans:ref local="testBean"/>
</header>
</header-enricher>
<beans:bean id="testBean" class="org.springframework.integration.config.xml.HeaderEnricherTests$TestBean">
<beans:constructor-arg value="testBean"/>
</beans:bean>
</beans:beans>