Refactored XPath namespace support to allow input-channel and output-channel parser now extends AbstractConsumerEndpointParser

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContextHelper.java

@@ -28,14 +28,18 @@ public class TestXmlApplicationContextHelper {
 			+ "xmlns:si-xml='http://www.springframework.org/schema/integration/xml' "
 			+ "xmlns:si='http://www.springframework.org/schema/integration' "
 			+ "xmlns:util='http://www.springframework.org/schema/util' "
-			+ "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' " + "xsi:schemaLocation="
+			+ "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' "
+			+ "xmlns:context='http://www.springframework.org/schema/context' " 
+			+ "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-1.0.xsd "
 			+ "http://www.springframework.org/schema/integration/xml "
 			+ "http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd "
-			+ "http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd' >";
+			+ "http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd " +
+			  "http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd' >" +
+			  "<context:annotation-config/>";
 
 	private final static String footer = "</beans>";
 

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java

@@ -19,9 +19,13 @@ package org.springframework.integration.xml.config;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.xml.splitter.XPathMessageSplitter;
 import org.springframework.integration.xml.util.XmlTestUtil;
 import org.springframework.test.context.ContextConfiguration;
 import org.w3c.dom.Document;
@@ -31,20 +35,30 @@ import org.w3c.dom.Document;
  */
 @ContextConfiguration
 public class XPathMessageSplitterParserTests {
+	
+	String channelDefinitions = "<si:channel id='test-input' /><si:channel id='test-output'><si:queue capacity='10'/></si:channel>";
 
-
+	@Autowired @Qualifier("test-input")
+	MessageChannel inputChannel;
+	
+	@Autowired @Qualifier("test-output")
+	QueueChannel outputChannel;
+	
 	@Test
 	public void testSimpleStringExpression() throws Exception {
 		Document doc = XmlTestUtil.getDocumentForString("<names><name>Bob</name><name>John</name></names>");
 		GenericMessage<Document> docMessage = new GenericMessage<Document>(doc);
 
-		TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext("<si-xml:xpath-splitter id='splitter'><si-xml:xpath-expression expression='//name'/></si-xml:xpath-splitter>");
-		XPathMessageSplitter splitter = (XPathMessageSplitter) ctx.getBean("splitter");
+		TestXmlApplicationContext ctx = TestXmlApplicationContextHelper.getTestAppContext(  channelDefinitions + "<si-xml:xpath-splitter id='splitter' input-channel='test-input' output-channel='test-output'><si-xml:xpath-expression expression='//name'/></si-xml:xpath-splitter>");
 		
-		QueueChannel queueChannel = new QueueChannel(10);
-		splitter.setOutputChannel(queueChannel);
-		splitter.onMessage(docMessage);
-		assertEquals("Wrong number of split messages ", 2, queueChannel.getMesssageCount());
+		SubscribingConsumerEndpoint sce = (SubscribingConsumerEndpoint)ctx.getBean("splitter");
+		sce.start();
+		
+		ctx.getAutowireCapableBeanFactory().autowireBeanProperties(this, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false);
+		
+		inputChannel.send(docMessage);
+		Thread.sleep(5000);
+		assertEquals("Wrong number of split messages ", 2, outputChannel.getMesssageCount());
 	
 	}