X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxml%2FDomUtilsTest.java;fp=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxml%2FDomUtilsTest.java;h=d85f44646b0ed5751e6ad1c3f51a278117695aa8;hb=ed3ce3eb0c855255c91e974f07aef94f38009d70;hp=86fe91596fa93ae01fb9bdde85ac665b5cfce3a1;hpb=36320098ebdbe884869a9e04682a8a0291d25600;p=utils

diff --git a/support/general/src/test/java/org/wamblee/xml/DomUtilsTest.java b/support/general/src/test/java/org/wamblee/xml/DomUtilsTest.java
index 86fe9159..d85f4464 100644
--- a/support/general/src/test/java/org/wamblee/xml/DomUtilsTest.java
+++ b/support/general/src/test/java/org/wamblee/xml/DomUtilsTest.java
@@ -16,6 +16,7 @@
 package org.wamblee.xml;
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -24,10 +25,14 @@ import org.w3c.dom.Element;
 import static junit.framework.TestCase.*;
 
 public class DomUtilsTest {
+    
+    private InputStream getResource(String aResource) { 
+        return getClass().getResourceAsStream(aResource);
+    }
 
     @Test
     public void testReadWrite() throws Exception { 
-        Document doc = DomUtils.read(getClass().getResourceAsStream("test.xml"));
+        Document doc = DomUtils.read(getResource("test.xml"));
         Element element = doc.getDocumentElement();
         assertEquals("http://wamblee.org/test", element.getNamespaceURI());
         String val = DomUtils.serialize(doc);
@@ -35,4 +40,25 @@ public class DomUtilsTest {
         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"));
+        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 testReadAndValidateNotOk() throws Exception { 
+        Document doc = DomUtils.readAndValidate(getResource("testInvalid.xml"), getResource("test.xsd"));
+    }
 }