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

OPEN - issue INT-309: XPath Message Selector

Browse Source 
http://jira.springframework.org/browse/INT-309
refactored XPath selectors and routers
added support for Node payloads
This commit is contained in:
Jonas Partner
2008-09-30 09:20:06 +00:00
parent 8cea74f062
commit ed96dcc58f
11 changed files with 260 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.integration.xml;
import static org.junit.Assert.assertTrue;
import java.io.StringReader;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -25,8 +27,14 @@ import org.custommonkey.xmlunit.XMLAssert;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
/**
*
* @author Jonas Partner
*
*/
public class DefaultXmlPayloadConverterTests {
DefaultXmlPayloadConverter converter;
@@ -36,22 +44,41 @@ public class DefaultXmlPayloadConverterTests {
String testDocumentAsString = "<test>hello</test>";
@Before
public void setUp() throws Exception{
public void setUp() throws Exception {
converter = new DefaultXmlPayloadConverter();
testDocument = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(
new InputSource(new StringReader(testDocumentAsString)));
}
@Test
public void testWithString() {
public void testGetDocumentWithString() {
Document doc = converter.convertToDocument("<test>hello</test>");
XMLAssert.assertXMLEqual(testDocument, doc);
}
@Test
public void testWithDocument() {
public void testGetDocumentWithDocument() {
Document doc = converter.convertToDocument(testDocument);
Assert.assertTrue(doc == testDocument);
}
@Test
public void testGetNodePassingNode() {
Node element = (Node) testDocument.getElementsByTagName("test").item(0);
Node n = converter.convertToNode(element);
assertTrue("Wrong node returned", element == n);
}
@Test
public void testGetNodePassingString() {
Node n = converter.convertToNode("<test>hello</test>");
XMLAssert.assertXMLEqual(testDocument, (Document) n);
}
@Test
public void testGetNodePassingDocument() {
Node n = converter.convertToNode(testDocument);
XMLAssert.assertXMLEqual(testDocument, (Document) n);
}
}

10
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelNameResolverTests.java
View File

@@ -26,6 +26,7 @@ import org.springframework.integration.xml.util.XmlTestUtil;
import org.springframework.xml.xpath.XPathExpression;
import org.springframework.xml.xpath.XPathExpressionFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
/**
* @author Jonas Partner
@@ -73,4 +74,13 @@ public class XPathMultiChannelNameResolverTests {
resolver.resolveChannelNames(new StringMessage("test"));
}
@Test
public void testNodePayload() throws Exception {
XPathMultiChannelNameResolver resolver = new XPathMultiChannelNameResolver("./three/text()");
Document testDocument = XmlTestUtil.getDocumentForString("<one><two><three>bob</three><three>dave</three></two></one>");
String[] channelNames = resolver.resolveChannelNames(new GenericMessage<Node>(testDocument.getElementsByTagName("two").item(0)));
assertEquals("bob",channelNames[0]);
assertEquals("dave",channelNames[1]);
}
}

23
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelNameResolverTests.java
View File

@@ -19,14 +19,14 @@ package org.springframework.integration.xml.router;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.w3c.dom.Document;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.xml.util.XmlTestUtil;
import org.springframework.xml.xpath.XPathExpression;
import org.springframework.xml.xpath.XPathExpressionFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
/**
* @author Jonas Partner
@@ -34,22 +34,19 @@ import org.springframework.xml.xpath.XPathExpressionFactory;
public class XPathSingleChannelNameResolverTests {
@Test
@SuppressWarnings("unchecked")
public void testSimpleDocType() throws Exception {
Document doc = XmlTestUtil.getDocumentForString("<doc type='one' />");
XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type");
XPathSingleChannelNameResolver resolver = new XPathSingleChannelNameResolver(expression);
String channelName = resolver.resolveChannelName(new GenericMessage(doc));
String channelName = resolver.resolveChannelNames(new GenericMessage<Document>(doc))[0];
assertEquals("Wrong channel name", "one", channelName);
}
@Test
@SuppressWarnings("unchecked")
public void testSimpleStringDoc() throws Exception {
XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type");
XPathSingleChannelNameResolver resolver = new XPathSingleChannelNameResolver(expression);
String channelName = resolver.resolveChannelName(new GenericMessage("<doc type='one' />"));
String channelName = resolver.resolveChannelNames(new GenericMessage<String>("<doc type='one' />"))[0];
assertEquals("Wrong channel name", "one", channelName);
}
@@ -57,7 +54,15 @@ public class XPathSingleChannelNameResolverTests {
public void testNonNodePayload() throws Exception {
XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type");
XPathSingleChannelNameResolver resolver = new XPathSingleChannelNameResolver(expression);
resolver.resolveChannelName(new StringMessage("test"));
resolver.resolveChannelNames(new StringMessage("test"));
}
@Test
public void testNodePayload() throws Exception {
XPathSingleChannelNameResolver resolver = new XPathSingleChannelNameResolver("./three/text()");
Document testDocument = XmlTestUtil.getDocumentForString("<one><two><three>bob</three></two></one>");
String[] channelNames = resolver.resolveChannelNames(new GenericMessage<Node>(testDocument
.getElementsByTagName("two").item(0)));
assertEquals("bob", channelNames[0]);
}
}

13
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java
View File

@@ -25,6 +25,7 @@ import org.springframework.integration.xml.util.XmlTestUtil;
import org.springframework.xml.xpath.XPathExpression;
import org.springframework.xml.xpath.XPathExpressionFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
/**
*
@@ -55,12 +56,22 @@ public class BooleanTestXpathMessageSelectorTests {
}
@Test
public void testWithXPathExpressionProvided(){
public void testStringWithXPathExpressionProvided(){
XPathExpression xpathExpression = XPathExpressionFactory.createXPathExpression("boolean(/one/two)");
BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector(xpathExpression);
assertTrue(selector.accept(new StringMessage("<one><two/></one>")) ) ;
assertFalse(selector.accept(new StringMessage("<one><three/></one>")) ) ;
}
@Test
public void testNodeWithXPathExpressionAsString() throws Exception{
XPathExpression xpathExpression = XPathExpressionFactory.createXPathExpression("boolean(./three)");
BooleanTestXPathMessageSelector selector = new BooleanTestXPathMessageSelector(xpathExpression);
Document testDocument = XmlTestUtil.getDocumentForString("<one><two><three/></two></one>");
assertTrue(selector.accept(new GenericMessage<Node>(testDocument.getElementsByTagName("two").item(0))));
assertFalse(selector.accept(new GenericMessage<Node>(testDocument.getElementsByTagName("three").item(0))));
}
}