xmlunit-commits Mailing List for XML Unit (Page 153)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 340
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=340&view=rev
Author:   bodewig
Date:     2009-06-02 13:32:19 +0000 (Tue, 02 Jun 2009)

Log Message:
-----------
implement validation for DTDs in Java

Modified Paths:
--------------
    trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/JAXPValidator.java
    trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/Validator.java

Added Paths:
-----------
    trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ParsingValidator.java
    trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ValidationHandler.java
    trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/ParsingValidatorTest.java
    trunk/xmlunit/src/tests/resources/Book.dtd
    trunk/xmlunit/src/tests/resources/BookWithDoctype.xml
    trunk/xmlunit/src/tests/resources/invalidBookWithDoctype.xml

Modified: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/JAXPValidator.java
===================================================================

--- trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/JAXPValidator.java	2009-05-28 13:07:01 UTC (rev 339)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/JAXPValidator.java	2009-06-02 13:32:19 UTC (rev 340)
@@ -13,14 +13,10 @@
 */
 package net.sf.xmlunit.validation;
 
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
 import javax.xml.transform.Source;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import net.sf.xmlunit.exceptions.XMLUnitException;
-import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
@@ -86,42 +82,4 @@
         return v.getResult();
     }
 
-
-    private static class ValidationHandler implements ErrorHandler {
-        private List<ValidationProblem> problems =
-            new LinkedList<ValidationProblem>();
-        private boolean valid = true;
-        // fatal errors are re-thrown by the parser
-        private SAXParseException lastFatalError = null;
-
-        public void error(SAXParseException e) {
-            if (e != lastFatalError) {
-                valid = false;
-                problems.add(ValidationProblem.fromException(e,
-                                                             ValidationProblem
-                                                             .ProblemType.ERROR)
-                             );
-            }
-        }
-
-        public void fatalError(SAXParseException e) {
-            valid = false;
-            lastFatalError = e;
-            problems.add(ValidationProblem.fromException(e,
-                                                         ValidationProblem
-                                                         .ProblemType.ERROR));
-        }
-
-        public void warning(SAXParseException e) {
-            problems.add(ValidationProblem.fromException(e,
-                                                         ValidationProblem
-                                                         .ProblemType.WARNING));
-        }
-
-        private ValidationResult getResult() {
-            return new ValidationResult(valid,
-                                        Collections.unmodifiableList(problems)
-                                        );
-        }
-    }
 }

Added: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ParsingValidator.java
===================================================================
--- trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ParsingValidator.java	                        (rev 0)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ParsingValidator.java	2009-06-02 13:32:19 UTC (rev 340)
@@ -0,0 +1,152 @@
+/*
+  This file is licensed to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+package net.sf.xmlunit.validation;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.sax.SAXSource;
+import net.sf.xmlunit.exceptions.ConfigurationException;
+import net.sf.xmlunit.exceptions.XMLUnitException;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Validator implementation that uses "the old way" of validating an
+ * XML input by parsing the input.
+ *
+ * <p>Even though this implementation supports W3C Schema you
+ * shouldn't use it for that language but rather use
+ * JAXPValidator.</p>
+ */
+public class ParsingValidator extends Validator {
+    private final String language;
+
+    public ParsingValidator(String language) {
+        if (!Languages.W3C_XML_SCHEMA_NS_URI.equals(language)
+            && !Languages.XML_DTD_NS_URI.equals(language)) {
+            throw new IllegalArgumentException("only DTD and W3C Schema"
+                                               + " validation are supported by"
+                                               + " ParsingValidator");
+        }
+        this.language = language;
+    }
+
+    @Override public ValidationResult validateSchema() {
+        throw new XMLUnitException("Schema validation is not supported by"
+                                   + " ParsinValidator");
+    }
+
+    @Override public ValidationResult validateInstance(Source s) {
+        try {
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            factory.setValidating(true);
+            SAXParser parser = factory.newSAXParser();
+            if (Languages.W3C_XML_SCHEMA_NS_URI.equals(language)) {
+                parser.setProperty(Properties.SCHEMA_LANGUAGE,
+                                   Languages.W3C_XML_SCHEMA_NS_URI);
+            }
+            final Source[] source = getSchemaSources();
+            Handler handler = new Handler();
+            if (source.length != 0) {
+                if (Languages.W3C_XML_SCHEMA_NS_URI.equals(language)) {
+                    InputSource[] schemaSource = new InputSource[source.length];
+                    for (int i = 0; i < source.length; i++) {
+                        schemaSource[i] = toInputSource(source[i]);
+                    }
+                    parser.setProperty(Properties.SCHEMA_SOURCE,
+                                       schemaSource);
+                } else if (source.length == 1) {
+                    handler.setSchemaSystemId(source[0].getSystemId());
+                }
+            }
+            InputSource input = toInputSource(s);
+            try {
+                parser.parse(input, handler);
+            } catch (SAXException e) {
+                if (e instanceof SAXParseException) {
+                    handler.error((SAXParseException) e);
+                } else {
+                    throw new XMLUnitException(e);
+                }
+            }
+            return handler.getResult();
+        } catch (ParserConfigurationException ex) {
+            throw new ConfigurationException(ex);
+        } catch (SAXNotRecognizedException ex) {
+            throw new ConfigurationException(ex);
+        } catch (SAXNotSupportedException ex) {
+            throw new ConfigurationException(ex);
+        } catch (SAXException ex) {
+            throw new XMLUnitException(ex);
+        } catch (java.io.IOException ex) {
+            throw new XMLUnitException(ex);
+        }
+    }
+
+    // TODO factor out to a common class, will be needed by other parts as well
+    private static InputSource toInputSource(Source s) throws SAXException {
+        return SAXSource.sourceToInputSource(s);
+    }
+
+    private static class Properties {
+        static final String SCHEMA_LANGUAGE =
+            "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+
+        static final String SCHEMA_SOURCE =
+            "http://java.sun.com/xml/jaxp/properties/schemaSource";
+    }
+
+    private class Handler extends DefaultHandler {
+        private final ValidationHandler v = new ValidationHandler();
+        private String systemId;
+
+        @Override public void error(SAXParseException e) {
+            v.error(e);
+        }
+
+        @Override public void fatalError(SAXParseException e) {
+            v.fatalError(e);
+        }
+
+        @Override public void warning(SAXParseException e) {
+            v.warning(e);
+        }
+
+        private void setSchemaSystemId(String id) {
+            systemId = id;
+        }
+
+        @Override public InputSource resolveEntity(String publicId,
+                                                   String systemId)
+            throws java.io.IOException, SAXException {
+            if (this.systemId != null &&
+                (getSchemaURI() == null || getSchemaURI().equals(publicId))
+                ) {
+                return new InputSource(this.systemId);
+            }
+            return super.resolveEntity(publicId, systemId);
+        }
+
+        ValidationResult getResult() {
+            return v.getResult();
+        }
+    }
+}


Property changes on: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ParsingValidator.java
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ValidationHandler.java
===================================================================
--- trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ValidationHandler.java	                        (rev 0)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ValidationHandler.java	2009-06-02 13:32:19 UTC (rev 340)
@@ -0,0 +1,61 @@
+/*
+  This file is licensed to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+package net.sf.xmlunit.validation;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+
+/**
+ * ErrorHandler collecting parser exceptions as ValidationProblems
+ */
+final class ValidationHandler implements ErrorHandler {
+    private List<ValidationProblem> problems =
+        new LinkedList<ValidationProblem>();
+    private boolean valid = true;
+    // fatal errors are re-thrown by the parser
+    private SAXParseException lastFatalError = null;
+
+    public void error(SAXParseException e) {
+        if (e != lastFatalError) {
+            valid = false;
+            problems.add(ValidationProblem.fromException(e,
+                                                         ValidationProblem
+                                                         .ProblemType.ERROR)
+                         );
+        }
+    }
+
+    public void fatalError(SAXParseException e) {
+        valid = false;
+        lastFatalError = e;
+        problems.add(ValidationProblem.fromException(e,
+                                                     ValidationProblem
+                                                     .ProblemType.ERROR));
+    }
+
+    public void warning(SAXParseException e) {
+        problems.add(ValidationProblem.fromException(e,
+                                                     ValidationProblem
+                                                     .ProblemType.WARNING));
+    }
+
+    ValidationResult getResult() {
+        return new ValidationResult(valid,
+                                    Collections.unmodifiableList(problems)
+                                    );
+    }
+}


Property changes on: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/ValidationHandler.java
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/Validator.java
===================================================================
--- trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/Validator.java	2009-05-28 13:07:01 UTC (rev 339)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/validation/Validator.java	2009-06-02 13:32:19 UTC (rev 340)
@@ -78,6 +78,9 @@
      * @see Languages
      */
     public static Validator forLanguage(String language) {
-        return null;
+        if (!Languages.XML_DTD_NS_URI.equals(language)) {
+            return new JAXPValidator(language);
+        }
+        return new ParsingValidator(Languages.XML_DTD_NS_URI);
     }
 }
\ No newline at end of file

Added: trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/ParsingValidatorTest.java
===================================================================
--- trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/ParsingValidatorTest.java	                        (rev 0)
+++ trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/ParsingValidatorTest.java	2009-06-02 13:32:19 UTC (rev 340)
@@ -0,0 +1,58 @@
+/*
+  This file is licensed to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+package net.sf.xmlunit.validation;
+
+import java.io.File;
+import javax.xml.transform.stream.StreamSource;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class ParsingValidatorTest {
+
+    @Test public void shouldSuccessfullyValidateSchemaInstance() {
+        ParsingValidator v =
+            new ParsingValidator(Languages.W3C_XML_SCHEMA_NS_URI);
+        v.setSchemaSource(new StreamSource(new File("src/tests/resources/Book.xsd")));
+        ValidationResult r = v.validateInstance(new StreamSource(new File("src/tests/resources/BookXsdGenerated.xml")));
+        assertTrue(r.isValid());
+        assertFalse(r.getProblems().iterator().hasNext());
+    }
+
+    @Test public void shouldFailOnBrokenSchemaInstance() {
+        ParsingValidator v =
+            new ParsingValidator(Languages.W3C_XML_SCHEMA_NS_URI);
+        v.setSchemaSource(new StreamSource(new File("src/tests/resources/Book.xsd")));
+        ValidationResult r = v.validateInstance(new StreamSource(new File("src/tests/resources/invalidBook.xml")));
+        assertFalse(r.isValid());
+        assertTrue(r.getProblems().iterator().hasNext());
+    }
+
+    @Test public void shouldSuccessfullyValidateDTDInstance() {
+        ParsingValidator v =
+            new ParsingValidator(Languages.XML_DTD_NS_URI);
+        v.setSchemaSource(new StreamSource(new File("src/tests/resources/Book.dtd")));
+        ValidationResult r = v.validateInstance(new StreamSource(new File("src/tests/resources/BookWithDoctype.xml")));
+        assertTrue(r.isValid());
+        assertFalse(r.getProblems().iterator().hasNext());
+    }
+
+    @Test public void shouldFailOnBrokenDTDInstance() {
+        ParsingValidator v =
+            new ParsingValidator(Languages.XML_DTD_NS_URI);
+        v.setSchemaSource(new StreamSource(new File("src/tests/resources/Book.dtd")));
+        ValidationResult r = v.validateInstance(new StreamSource(new File("src/tests/resources/invalidBookWithDoctype.xml")));
+        assertFalse(r.isValid());
+        assertTrue(r.getProblems().iterator().hasNext());
+    }
+}


Property changes on: trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/validation/ParsingValidatorTest.java
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/xmlunit/src/tests/resources/Book.dtd
===================================================================
--- trunk/xmlunit/src/tests/resources/Book.dtd	                        (rev 0)
+++ trunk/xmlunit/src/tests/resources/Book.dtd	2009-06-02 13:32:19 UTC (rev 340)
@@ -0,0 +1,6 @@
+<!ELEMENT Book (Title, Author*, Date, ISBN, Publisher) >
+<!ELEMENT Title (#PCDATA)>
+<!ELEMENT Author (#PCDATA)>
+<!ELEMENT Date (#PCDATA)>
+<!ELEMENT ISBN (#PCDATA)>
+<!ELEMENT Publisher (#PCDATA)>


Property changes on: trunk/xmlunit/src/tests/resources/Book.dtd
___________________________________________________________________
Added: svn:eol-style
   + native

Copied: trunk/xmlunit/src/tests/resources/BookWithDoctype.xml (from rev 339, trunk/xmlunit/src/tests/resources/BookXsdGeneratedNoSchema.xml)
===================================================================
--- trunk/xmlunit/src/tests/resources/BookWithDoctype.xml	                        (rev 0)
+++ trunk/xmlunit/src/tests/resources/BookWithDoctype.xml	2009-06-02 13:32:19 UTC (rev 340)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Book PUBLIC "XMLUNIT/TEST/PUB" "http://example.org/nonsense">
+<Book>
+    <Title>Chicken Soup for the Soul</Title>
+    <Author>Jack Canfield</Author>
+    <Author>Mark Victor Hansen</Author>
+    <Date>1993</Date>
+    <ISBN>1-55874-262-X</ISBN>
+    <Publisher>Health Communications, Inc.</Publisher>
+</Book>


Property changes on: trunk/xmlunit/src/tests/resources/BookWithDoctype.xml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: trunk/xmlunit/src/tests/resources/invalidBookWithDoctype.xml (from rev 339, trunk/xmlunit/src/tests/resources/invalidBook.xml)
===================================================================
--- trunk/xmlunit/src/tests/resources/invalidBookWithDoctype.xml	                        (rev 0)
+++ trunk/xmlunit/src/tests/resources/invalidBookWithDoctype.xml	2009-06-02 13:32:19 UTC (rev 340)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Book PUBLIC "XMLUNIT/TEST/PUB" "http://example.org/nonsense">
+<Book>
+    <Title>Chicken Soup for the Soul</Title>
+    <Author>Jack Canfield</Author>
+    <Author>Mark Victor Hansen</Author>
+    <Date>1993</Date>
+    <ISBN>1-55874-262-X</ISBN>
+</Book>


Property changes on: trunk/xmlunit/src/tests/resources/invalidBookWithDoctype.xml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb (3)	Mar (18)	Apr (39)	May (15)	Jun (12)	Jul (3)	Aug (23)	Sep	Oct (1)	Nov (1)	Dec (3)
2008	Jan (21)	Feb (23)	Mar (33)	Apr (8)	May (1)	Jun (22)	Jul	Aug (1)	Sep (1)	Oct (6)	Nov	Dec (11)
2009	Jan (5)	Feb	Mar (2)	Apr (24)	May (36)	Jun (18)	Jul (2)	Aug (3)	Sep (9)	Oct (3)	Nov (1)	Dec
2010	Jan (5)	Feb (3)	Mar	Apr (15)	May (24)	Jun (11)	Jul (8)	Aug (34)	Sep (42)	Oct	Nov	Dec
2011	Jan (13)	Feb (32)	Mar (35)	Apr (31)	May (33)	Jun (30)	Jul (32)	Aug (31)	Sep (30)	Oct (31)	Nov (32)	Dec (31)
2012	Jan (35)	Feb (31)	Mar (31)	Apr (30)	May (31)	Jun (34)	Jul (23)	Aug (30)	Sep (30)	Oct (29)	Nov (30)	Dec (32)
2013	Jan (25)	Feb (39)	Mar (1)	Apr (18)	May (1)	Jun	Jul (1)	Aug (20)	Sep (41)	Oct (32)	Nov (9)	Dec (31)
2014	Jan (31)	Feb (30)	Mar (34)	Apr (60)	May (31)	Jun (28)	Jul (32)	Aug (28)	Sep (26)	Oct (32)	Nov (43)	Dec (115)
2015	Jan (106)	Feb (101)	Mar (51)	Apr (32)	May (63)	Jun (18)	Jul	Aug (18)	Sep	Oct (1)	Nov (84)	Dec (63)
2016	Jan (26)	Feb (17)	Mar (104)	Apr (30)	May (6)	Jun (30)	Jul	Aug	Sep	Oct (3)	Nov (48)	Dec (22)
2017	Jan (15)	Feb (29)	Mar (43)	Apr (29)	May (25)	Jun (28)	Jul (62)	Aug (35)	Sep (35)	Oct (72)	Nov (10)	Dec (4)
2018	Jan (7)	Feb (4)	Mar	Apr (46)	May (20)	Jun (12)	Jul (9)	Aug (42)	Sep (4)	Oct (17)	Nov (32)	Dec (31)
2019	Jan (21)	Feb (14)	Mar	Apr (74)	May (25)	Jun (43)	Jul (2)	Aug (1)	Sep	Oct (2)	Nov	Dec (10)
2020	Jan (1)	Feb	Mar (26)	Apr (8)	May (62)	Jun (4)	Jul (25)	Aug	Sep (21)	Oct (24)	Nov (26)	Dec (9)
2021	Jan	Feb (4)	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (1)	Oct (11)	Nov (1)	Dec (12)
2022	Jan (47)	Feb	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (14)
2023	Jan (3)	Feb	Mar (60)	Apr (9)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2024	Jan (5)	Feb	Mar	Apr (10)	May (1)	Jun	Jul	Aug (17)	Sep (2)	Oct	Nov	Dec (1)
2025	Jan	Feb	Mar (88)	Apr (64)	May (47)	Jun (20)	Jul	Aug	Sep	Oct	Nov	Dec

xmlunit-commits Mailing List for XML Unit (Page 153)

XMLUnit provides assertions that help testing code that produces XML.

xmlunit-commits — receives commit mails