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

Resolved #SWS-61: DomContentHandler throwing NullpointerExption on document

Browse Source
This commit is contained in:
Arjen Poutsma
2006-11-14 12:41:20 +00:00
parent ce6f562937
commit eae86947ac
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java
View File

@@ -37,11 +37,11 @@ import org.xml.sax.helpers.DefaultHandler;
*/
public class DomContentHandler extends DefaultHandler {
private Document document;
private final Document document;
private List elements = new ArrayList();
private final List elements = new ArrayList();
private Node node;
private final Node node;
/**
* Creates a new instance of the <code>DomContentHandler</code> with the given node.
@@ -54,6 +54,10 @@ public class DomContentHandler extends DefaultHandler {
if (node instanceof Document) {
document = (Document) node;
}
else {
document = node.getOwnerDocument();
}
Assert.notNull(document, "document must not be null");
}
private Node getParent() {

34
xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java
View File

@@ -22,17 +22,24 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
public class DomContentHandlerTest extends XMLTestCase {
private static final String XML_CONTENT_HANDLER = "<?xml version='1.0' encoding='UTF-8'?>" + "<?pi content?>" +
private static final String XML_1 = "<?xml version='1.0' encoding='UTF-8'?>" + "<?pi content?>" +
"<root xmlns='namespace'>" +
"<prefix:child xmlns:prefix='namespace2' xmlns:prefix2='namespace3' prefix2:attr='value'>content</prefix:child>" +
"</root>";
private static final String XML_2_EXPECTED = "<?xml version='1.0' encoding='UTF-8'?>" + "<root xmlns='namespace'>" +
"<child xmlns='namespace2' />" + "</root>";
private static final String XML_2_SNIPPET =
"<?xml version='1.0' encoding='UTF-8'?>" + "<child xmlns='namespace2' />";
private Document expected;
private DomContentHandler handler;
@@ -41,20 +48,33 @@ public class DomContentHandlerTest extends XMLTestCase {
private XMLReader xmlReader;
private DocumentBuilder documentBuilder;
protected void setUp() throws Exception {
xmlReader = XMLReaderFactory.createXMLReader();
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
documentBuilder = documentBuilderFactory.newDocumentBuilder();
result = documentBuilder.newDocument();
handler = new DomContentHandler(result);
expected = documentBuilder.parse(new InputSource(new StringReader(XML_CONTENT_HANDLER)));
xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
}
public void testContentHandler() throws Exception {
xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
public void testContentHandlerDocument() throws Exception {
handler = new DomContentHandler(result);
expected = documentBuilder.parse(new InputSource(new StringReader(XML_1)));
xmlReader.setContentHandler(handler);
xmlReader.parse(new InputSource(new StringReader(XML_CONTENT_HANDLER)));
xmlReader.parse(new InputSource(new StringReader(XML_1)));
assertXMLEqual("Invalid result", expected, result);
}
public void testContentHandlerElement() throws Exception {
Element rootElement = result.createElementNS("namespace", "root");
result.appendChild(rootElement);
handler = new DomContentHandler(rootElement);
expected = documentBuilder.parse(new InputSource(new StringReader(XML_2_EXPECTED)));
xmlReader.setContentHandler(handler);
xmlReader.parse(new InputSource(new StringReader(XML_2_SNIPPET)));
assertXMLEqual("Invalid result", expected, result);
}
}