Author: veithen
Date: Mon Dec 16 15:35:34 2013
New Revision: 1551235
URL: http://svn.apache.org/r1551235
Log:
Use the getSAXResult API instead of SAXOMBuilder in integration tests.
Added:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java
(contents, props changed)
- copied, changed from r1551209,
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
(contents, props changed)
- copied, changed from r1551209,
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java
(contents, props changed)
- copied, changed from r1551209,
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java
Removed:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java
Copied:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java
(from r1551209,
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java?p2=webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java&p1=webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java&r1=1551209&r2=1551235&rev=1551235&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java
Mon Dec 16 15:35:34 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.om.impl.builder;
+package org.apache.axiom.om;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLIdentical;
import static org.custommonkey.xmlunit.XMLUnit.compareXML;
@@ -29,11 +29,13 @@ import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.impl.builder.test.jaxb.Order;
import org.apache.axiom.om.impl.builder.test.jaxb.OrderItem;
import org.junit.Test;
-public class SAXOMBuilderJAXBTest {
+public class SAXResultJAXBTest {
@Test
public void test() throws Exception {
List<OrderItem> items = new ArrayList<OrderItem>(2);
@@ -53,9 +55,9 @@ public class SAXOMBuilderJAXBTest {
StringWriter out = new StringWriter();
marshaller.marshal(order, out);
- SAXOMBuilder builder = new SAXOMBuilder();
- marshaller.marshal(order, builder);
+ OMDocument document =
OMAbstractFactory.getOMFactory().createOMDocument();
+ marshaller.marshal(order, document.getSAXResult().getHandler());
- assertXMLIdentical(compareXML(out.toString(),
builder.getRootElement().toString()), true);
+ assertXMLIdentical(compareXML(out.toString(),
document.getOMDocumentElement().toString()), true);
}
}
Propchange:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
(from r1551209,
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java?p2=webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java&p1=webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java&r1=1551209&r2=1551235&rev=1551235&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
Mon Dec 16 15:35:34 2013
@@ -17,28 +17,31 @@
* under the License.
*/
-package org.apache.axiom.om.impl.builder;
+package org.apache.axiom.om;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import javax.xml.parsers.SAXParserFactory;
import junit.framework.TestSuite;
import org.apache.axiom.om.AbstractTestCase;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMDocument;
import org.apache.axiom.testutils.XMLAssertEx;
import org.apache.axiom.testutils.conformance.ConformanceTestFile;
import org.custommonkey.xmlunit.XMLUnit;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-public class SAXOMBuilderSAXParserTest extends AbstractTestCase {
+public class SAXResultSAXParserTest extends AbstractTestCase {
private final SAXParserFactory factory;
private final ConformanceTestFile file;
- public SAXOMBuilderSAXParserTest(String name, SAXParserFactory factory,
ConformanceTestFile file) {
+ public SAXResultSAXParserTest(String name, SAXParserFactory factory,
ConformanceTestFile file) {
super(name);
this.factory = factory;
this.file = file;
@@ -48,14 +51,15 @@ public class SAXOMBuilderSAXParserTest e
protected void runTest() throws Throwable {
factory.setNamespaceAware(true);
XMLReader reader = factory.newSAXParser().getXMLReader();
- SAXOMBuilder builder = new SAXOMBuilder();
- reader.setContentHandler(builder);
- reader.setDTDHandler(builder);
- reader.setProperty("http://xml.org/sax/properties/lexical-handler";,
builder);
-
reader.setProperty("http://xml.org/sax/properties/declaration-handler";,
builder);
+ OMDocument document =
OMAbstractFactory.getOMFactory().createOMDocument();
+ ContentHandler handler = document.getSAXResult().getHandler();
+ reader.setContentHandler(handler);
+ reader.setDTDHandler((DTDHandler)handler);
+ reader.setProperty("http://xml.org/sax/properties/lexical-handler";,
handler);
+
reader.setProperty("http://xml.org/sax/properties/declaration-handler";,
handler);
reader.parse(new InputSource(file.getUrl().toString()));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- builder.getDocument().serialize(baos);
+ document.serialize(baos);
XMLUnit.setIgnoreAttributeOrder(true);
XMLAssertEx.assertXMLIdentical(file.getUrl(),
new ByteArrayInputStream(baos.toByteArray()), true);
@@ -63,7 +67,7 @@ public class SAXOMBuilderSAXParserTest e
private static void addTests(TestSuite suite, SAXParserFactory factory,
String name) throws Exception {
for (ConformanceTestFile file :
ConformanceTestFile.getConformanceTestFiles()) {
- suite.addTest(new SAXOMBuilderSAXParserTest(
+ suite.addTest(new SAXResultSAXParserTest(
file.getShortName() + " - " + name, factory, file));
}
}
Propchange:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java
(from r1551209,
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java?p2=webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java&p1=webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java&r1=1551209&r2=1551235&rev=1551235&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java
Mon Dec 16 15:35:34 2013
@@ -17,19 +17,23 @@
* under the License.
*/
-package org.apache.axiom.om.impl.builder;
+package org.apache.axiom.om;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLIdentical;
import static org.custommonkey.xmlunit.XMLUnit.compareXML;
import java.io.StringWriter;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.impl.builder.test.xmlbeans.OrderDocument;
import org.apache.axiom.om.impl.builder.test.xmlbeans.OrderDocument.Order;
import org.apache.axiom.om.impl.builder.test.xmlbeans.OrderDocument.Order.Item;
import org.junit.Test;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ext.LexicalHandler;
-public class SAXOMBuilderXMLBeansTest {
+public class SAXResultXMLBeansTest {
@Test
public void test() throws Exception {
OrderDocument document = OrderDocument.Factory.newInstance();
@@ -44,9 +48,10 @@ public class SAXOMBuilderXMLBeansTest {
StringWriter out = new StringWriter();
document.save(out);
- SAXOMBuilder builder = new SAXOMBuilder();
- document.save(builder, builder);
+ OMDocument omDocument =
OMAbstractFactory.getOMFactory().createOMDocument();
+ ContentHandler handler = omDocument.getSAXResult().getHandler();
+ document.save(handler, (LexicalHandler)handler);
- assertXMLIdentical(compareXML(out.toString(),
builder.getRootElement().toString()), true);
+ assertXMLIdentical(compareXML(out.toString(),
omDocument.getOMDocumentElement().toString()), true);
}
}
Propchange:
webservices/axiom/trunk/modules/axiom-integration/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java
------------------------------------------------------------------------------
svn:eol-style = native
