added XMLDocument, XMLSchema, and XSLTransformation classes.

[utils] / support / general / src / test / java / org / wamblee / xml / XMLSchemaTest.java

diff --git a/support/general/src/test/java/org/wamblee/xml/DomUtilsTest.java b/support/general/src/test/java/org/wamblee/xml/XMLSchemaTest.java
similarity index 52%
rename from support/general/src/test/java/org/wamblee/xml/DomUtilsTest.java
rename to support/general/src/test/java/org/wamblee/xml/XMLSchemaTest.java
index d85f44646b0ed5751e6ad1c3f51a278117695aa8..4881824d3b1cf1008dd45bdfb44bb178fd37f670 100644 (file)
--- a/support/general/src/test/java/org/wamblee/xml/DomUtilsTest.java
+++ b/support/general/src/test/java/org/wamblee/xml/XMLSchemaTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2005-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,49 +16,44 @@
 package org.wamblee.xml;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
+import static junit.framework.Assert.*;
 import static junit.framework.TestCase.*;
 
-public class DomUtilsTest {
+import static org.wamblee.xml.XMLDocument.*;
+
+public class XMLSchemaTest {
     
     private InputStream getResource(String aResource) { 
         return getClass().getResourceAsStream(aResource);
     }
-
-    @Test
-    public void testReadWrite() throws Exception { 
-        Document doc = DomUtils.read(getResource("test.xml"));
-        Element element = doc.getDocumentElement();
-        assertEquals("http://wamblee.org/test", element.getNamespaceURI());
-        String val = DomUtils.serialize(doc);
-        // parse the written document
-        Document doc2 = DomUtils.read(new ByteArrayInputStream(val.getBytes()));
-        XmlUtils.assertEquals("", doc, doc2);
-    }
-    
-    @Test(expected = XMLException.class)
-    public void testReadNotWellFormed() throws Exception { 
-        Document doc = DomUtils.read(getResource("testNotWellFormed.xml"));
-    }
     
     @Test
     public void testReadAndValidateOk() throws Exception { 
-        Document doc = DomUtils.readAndValidate(getResource("test.xml"), getResource("test.xsd"));
+        
+        XMLDocument xmldoc = xmldocument("test.xml", getResource("test.xml")).validate("test.xsd", getResource("test.xsd"), null);
+        Document doc = xmldoc.getDocument();
         Element element = doc.getDocumentElement();
         assertEquals("http://wamblee.org/test", element.getNamespaceURI());
-        String val = DomUtils.serialize(doc);
+        
+        String val = xmldoc.print(false);
         // parse the written document
-        Document doc2 = DomUtils.read(new ByteArrayInputStream(val.getBytes()));
+        Document doc2 = xmldocument("input.xml", new ByteArrayInputStream(val.getBytes())).getDocument();
         XmlUtils.assertEquals("", doc, doc2);
     }
     
     @Test(expected = XMLException.class)
-    public void testReadAndValidateNotOk() throws Exception { 
-        Document doc = DomUtils.readAndValidate(getResource("testInvalid.xml"), getResource("test.xsd"));
+    public void testReadAndValidateNotOk() throws Exception {
+        XMLDocument xmldoc = xmldocument("testInvalid.xml", getResource("testInvalid.xml")).validate("test.xsd", getResource("test.xsd"), null);
     }
 }