[jboss-svn-commits] JBoss Common SVN: r2363 - in jbossxb/trunk/src/test: resources/xml/book and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-04-04 16:01:57 -0400 (Wed, 04 Apr 2007)
New Revision: 2363

Added:
   jbossxb/trunk/src/test/resources/xml/book/books2-dtd.xml
   jbossxb/trunk/src/test/resources/xml/book/books2.dtd
Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/xml/SimpleTestCase.java
Log:
Add a test for disabling document validation

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xml/SimpleTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xml/SimpleTestCase.java	2007-04-03 19:58:40 UTC (rev 2362)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xml/SimpleTestCase.java	2007-04-04 20:01:57 UTC (rev 2363)
@@ -76,6 +76,28 @@
       unmarshalBook("book-dtd.xml", factory);
    }
 
+   public void testUnmarshalBooks2Dtd() throws Exception
+   {
+      // create an object model factory
+      String xmlSource = "books2-dtd.xml";
+      ObjectModelFactory factory = new BookObjectFactory();
+      log.debug("<test-unmarshal-" + xmlSource + '>');
+
+      // get the XML stream
+      URL xmlUrl = getResourceUrl("xml/book/" + xmlSource);
+
+      // create unmarshaller
+      Unmarshaller unmarshaller = getBookUnmarshaller();
+      unmarshaller.setValidation(false);
+
+      // let the object model factory to create an instance of Book and populate it with data from XML
+      Book book = (Book)unmarshaller.unmarshal(xmlUrl.openStream(), factory, null);
+
+      checkUnmarshalledBook(book);
+
+      log.debug("</test-unmarshal-" + xmlSource + '>');
+   }
+
    public void testUnmarshalBookXs() throws Exception
    {
       // create an object model factory
@@ -297,6 +319,10 @@
                   {
                      return new InputSource(getResource("xml/book/books.dtd"));
                   }
+                  if(systemId.endsWith("books2.dtd"))
+                  {
+                     return new InputSource(getResource("xml/book/books2.dtd"));
+                  }
                   return null;
                }
             }

Added: jbossxb/trunk/src/test/resources/xml/book/books2-dtd.xml
===================================================================
--- jbossxb/trunk/src/test/resources/xml/book/books2-dtd.xml	                        (rev 0)
+++ jbossxb/trunk/src/test/resources/xml/book/books2-dtd.xml	2007-04-04 20:01:57 UTC (rev 2363)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//DTD Books//EN" "resources/xml/book/books2.dtd">
+
+<book isbn="0836217462">
+   <title>Being a Dog Is a Full-Time Job</title>
+   <author>Charles M. Schulz</author>
+   <character>
+      <name>Snoopy</name>
+      <friend-of>Peppermint Patty</friend-of>
+      <since>1950-10-04</since>
+      <qualification>extroverted beagle</qualification>
+   </character>
+   <character>
+      <name>Peppermint Patty</name>
+      <since>1966-08-22</since>
+      <qualification>bold, brash and tomboyish</qualification>
+   </character>
+</book>


Property changes on: jbossxb/trunk/src/test/resources/xml/book/books2-dtd.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: jbossxb/trunk/src/test/resources/xml/book/books2.dtd
===================================================================
--- jbossxb/trunk/src/test/resources/xml/book/books2.dtd	                        (rev 0)
+++ jbossxb/trunk/src/test/resources/xml/book/books2.dtd	2007-04-04 20:01:57 UTC (rev 2363)
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- A variation of the book dtd that requires 1 or
+more misc elements. This is used to test disabling
+xml document validation.
+-->
+<!ELEMENT book (title, author, character+, misc+)>
+<!ATTLIST book isbn CDATA #REQUIRED>
+
+<!ELEMENT title (#PCDATA)>
+
+<!ELEMENT author (#PCDATA)>
+
+<!ELEMENT character (name, friend-of?, since?, qualification?)>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT friend-of (#PCDATA)>
+<!ELEMENT since (#PCDATA)>
+<!ELEMENT qualification (#PCDATA)>
+<!-- Bogus element that will not be specified on documents -->
+<!ELEMENT misc (#PCDATA)>