Author: sagara
Date: Sun Sep 20 13:34:18 2009
New Revision: 817022
URL: http://svn.apache.org/viewvc?rev=817022&view=rev
Log:
fixed WODEN-152 - Woden shouldn't be dependent on Xerces
Modified:
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
Modified:
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java?rev=817022&r1=817021&r2=817022&view=diff
==============================================================================
---
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
(original)
+++
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
Sun Sep 20 13:34:18 2009
@@ -23,6 +23,9 @@
import java.net.URISyntaxException;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -44,9 +47,9 @@
import org.apache.woden.wsdl20.xml.TypesElement;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.xni.parser.XMLInputSource;
import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
* A test class to test the assertion tests in the WSDLDocumentValidator.
@@ -465,15 +468,15 @@
inlinedSchemas[1].setNamespace(new URI("http://www.sample.org";));
// Create DOM representation of schema, have XmlSchema parse it.
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder=factory.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
reader = new StringReader(schemaString);
- is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc2 = builder.getDocument();
+ is = new InputSource(reader);
+ Document schemaDoc2 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement());
XmlSchemaCollection xsc2 = new XmlSchemaCollection();
@@ -496,6 +499,14 @@
catch(WSDLException e)
{
fail("There was a problem running the test assertion method " + e);
+
+ } catch (ParserConfigurationException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+
+ } catch (SAXException e) {
+
+ fail("There was a problem parsing the test inline schema document");
}
@@ -512,15 +523,15 @@
inlinedSchemas[1].setNamespace(new URI("http://www.sample2.org";));
// Create DOM representation of schema, have XmlSchema parse it.
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder=factory.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
reader = new StringReader(schemaStringNS2);
- is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc2 = builder.getDocument();
+ is = new InputSource(reader);
+ Document schemaDoc2 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement());
XmlSchema xs2 = xsc.read(schemaDoc2.getDocumentElement());
@@ -543,6 +554,15 @@
{
fail("There was a problem running the test assertion method " + e);
}
+ catch (ParserConfigurationException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+
+ }
+ catch(SAXException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+ }
// Test that only one inline schema does not produce an error.
handler.reset();
@@ -554,11 +574,12 @@
inlinedSchemas[0].setNamespace(new URI("http://www.sample.org";));
// Create DOM representation of schema, have XmlSchema parse it.
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder=factory.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement());
inlinedSchemas[0].setSchemaDefinition(xs1);
@@ -579,6 +600,15 @@
{
fail("There was a problem running the test assertion method " + e);
}
+ catch (ParserConfigurationException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+
+ }
+ catch (SAXException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+ }
// Test that an inline schema that can not be read (that's null) does
not produce an error.
handler.reset();
@@ -613,11 +643,12 @@
inlinedSchemas[0].setNamespace(new URI("http://www.sample.org";));
// Create DOM representation of schema, have XmlSchema parse it.
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder=factory.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement());
inlinedSchemas[0].setSchemaDefinition(xs1);
@@ -638,6 +669,16 @@
{
fail("There was a problem running the test assertion method " + e);
}
+ catch (ParserConfigurationException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+
+ }
+ catch (SAXException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+ }
+
// Test that an inline schema with no defined target namespace doesn't
produce an error.
handler.reset();
@@ -707,15 +748,15 @@
// Create DOM representation of schema, have XmlSchema parse it.
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder=factory.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
reader = new StringReader(schemaString);
- is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc2 = builder.getDocument();
+ is = new InputSource(reader);
+ Document schemaDoc2 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement());
XmlSchemaCollection xsc2 = new XmlSchemaCollection();
@@ -739,6 +780,16 @@
{
fail("There was a problem running the test assertion method " + e);
}
+ catch (ParserConfigurationException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+
+ }
+ catch (SAXException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+ }
+
// Test that two inline schemas with different target namespaces
@@ -754,15 +805,15 @@
inlinedSchemas[1].setNamespace(new URI("http://www.sample2.org";));
// Create DOM representation of schema, have XmlSchema parse it.
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder=factory.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
reader = new StringReader(schemaStringNS2);
- is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc2 = builder.getDocument();
+ is = new InputSource(reader);
+ Document schemaDoc2 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement());
XmlSchema xs2 = xsc.read(schemaDoc2.getDocumentElement());
@@ -785,6 +836,15 @@
{
fail("There was a problem running the test assertion method " + e);
}
+ catch (ParserConfigurationException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+
+ }
+ catch (SAXException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+ }
// Test that only one inline schema does not produce an error.
handler.reset();
@@ -796,11 +856,12 @@
inlinedSchemas[0].setNamespace(new URI("http://www.sample.org";));
// Create DOM representation of schema, have XmlSchema parse it.
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder=factory.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement());
inlinedSchemas[0].setSchemaDefinition(xs1);
@@ -821,6 +882,15 @@
{
fail("There was a problem running the test assertion method " + e);
}
+ catch (ParserConfigurationException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+
+ }
+ catch (SAXException e) {
+
+ fail("There was a problem parsing the test inline schema document");
+ }
// Test that an inline schema that can not be read (that's null) does
not produce an error.
handler.reset();
@@ -1009,11 +1079,12 @@
+ "</complexType>"
+ "<element name=\"myElement\" type=\"string\"/>"
+ "</schema>";
- DOMParser builder = new DOMParser();
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder builder=dbf.newDocumentBuilder();
Reader reader = new StringReader(schemaString);
- XMLInputSource is = new XMLInputSource(null,null,null,reader,null);
- builder.parse(is);
- Document schemaDoc1 = builder.getDocument();
+ InputSource is = new InputSource(reader);
+ Document schemaDoc1 = builder.parse(is);
XmlSchemaCollection xsc = new XmlSchemaCollection();
xs1 = xsc.read(schemaDoc1.getDocumentElement());
schemaNS = new URI("http://www.sample.org";);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
