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

Cleaned up XSD to remove dependency on the order in which inner beans and pollers are defined. Added test case. Tested with JDK5

Browse Source
This commit is contained in:
Oleg Zhurakousky
2009-07-09 18:48:45 +00:00
parent 690a41f3c2
commit 8bd176c58a
3 changed files with 112 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java
View File

@@ -64,6 +64,17 @@ public class InnerDefinitionHandlerAwareEndpointParserTests {
String configProperty = testConfigurations.getProperty("splitter-inner-success");
this.testSplitterDefinitionSuccess(configProperty);
}
@Test
public void testInnerSplitterDefinitionSuccessWithPoller(){
String configProperty = testConfigurations.getProperty("splitter-inner-success-with-poller");
this.bootStrap(configProperty);
}
@Test
public void testInnerSplitterDefinitionSuccessWithPollerReversedOrder(){
String configProperty = testConfigurations.getProperty("splitter-inner-success-with-poller-reversed-order");
this.bootStrap(configProperty);
}
@Test
public void testRefSplitterDefinitionSuccess(){
String configProperty = testConfigurations.getProperty("splitter-ref-success");
@@ -135,11 +146,11 @@ public class InnerDefinitionHandlerAwareEndpointParserTests {
String configProperty = testConfigurations.getProperty("aggregator-inner-concurrent-success");
this.testAggregatorDefinitionSuccess(configProperty);
}
// @Test
// public void testInnerConcurrentAggregatorDefinitionSuccessReorderBeanPoller(){
// String configProperty = testConfigurations.getProperty("aggregator-inner-concurrent-success-reorder-bean-poller");
// this.testAggregatorDefinitionSuccess(configProperty);
// }
@Test
public void testInnerConcurrentAggregatorDefinitionSuccessReorderBeanPoller(){
String configProperty = testConfigurations.getProperty("aggregator-inner-concurrent-success-reorder-bean-poller");
this.testAggregatorDefinitionSuccess(configProperty);
}
@Test
public void testRefAggregatorDefinitionSuccess(){
String configProperty = testConfigurations.getProperty("aggregator-ref-success");

44
org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
View File

@@ -14,6 +14,50 @@ splitter-inner-success=\
<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
</splitter> \
</beans:beans>
splitter-inner-success-with-poller=\
<?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-2.5.xsd \
http://www.springframework.org/schema/integration \
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
<channel id="inChannel"> \
<queue capacity="2" /> \
</channel> \
<channel id="outChannel"> \
<queue capacity="2" /> \
</channel> \
<splitter id="testSplitter" input-channel="inChannel" output-channel="outChannel"> \
<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
<poller task-executor="executor" max-messages-per-poll="5"> \
<interval-trigger interval="20" /> \
</poller> \
</splitter> \
<thread-pool-task-executor id="executor" core-size="5" /> \
</beans:beans>
splitter-inner-success-with-poller-reversed-order=\
<?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-2.5.xsd \
http://www.springframework.org/schema/integration \
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
<channel id="inChannel"> \
<queue capacity="2" /> \
</channel> \
<channel id="outChannel"> \
<queue capacity="2" /> \
</channel> \
<splitter id="testSplitter" input-channel="inChannel" output-channel="outChannel"> \
<poller task-executor="executor" max-messages-per-poll="5"> \
<interval-trigger interval="20" /> \
</poller> \
<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
</splitter> \
<thread-pool-task-executor id="executor" core-size="5" /> \
</beans:beans>
splitter-ref-success=\
<?xml version="1.0" encoding="UTF-8"?> \
<beans:beans xmlns="http://www.springframework.org/schema/integration" \