X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxml%2FClasspathUriResolverTest.java;h=bc1c9cfc043a5500b8b8e64d4242629bc1223150;hb=3205980513232d44b49681aced7cd7f124a4d1a0;hp=7abe5d2ad8951b86bd092278fce95caed68434c8;hpb=df850821cf26ca07ef2474d4d2cabb61e9104291;p=utils

diff --git a/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java b/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
index 7abe5d2a..bc1c9cfc 100644
--- a/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
+++ b/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
@@ -15,8 +15,11 @@
  */
 package org.wamblee.xml;
 
+import static org.wamblee.xml.XMLDocument.*;
 import junit.framework.TestCase;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.wamblee.io.ClassPathResource;
@@ -29,13 +32,17 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
 
+import static junit.framework.TestCase.*;
+
 /**
  * Tests for {@link org.wamblee.xml.ClasspathUriResolver}.
  * 
  * @author Erik Brakkee
  */
-public class ClasspathUriResolverTest extends TestCase {
-    private static final String EXISTING_RESOURCE = "org/wamblee/xml/reportToHtml.xsl";
+public class ClasspathUriResolverTest {
+    private static final String REPORT_TO_HTML_XSL = "reportToHtml.xsl";
+    private static final String PREFIX = "org/wamblee/xml";
+    private static final String EXISTING_RESOURCE = PREFIX + "/" + REPORT_TO_HTML_XSL;
     private static final String NON_EXISTING_RESOURCE = "org/wamblee/xml/reportToHtml-nonexisting.xsl";
     private ClasspathUriResolver resolver;
 
@@ -44,37 +51,17 @@ public class ClasspathUriResolverTest extends TestCase {
      * 
      * @see junit.framework.TestCase#setUp()
      */
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         resolver = new ClasspathUriResolver();
     }
 
-    /**
-     * Resolves an existing file. Verifies the file is resolved correctly.
-     * 
-     * @throws TransformerException
-     * @throws IOException
-     */
-    public void testResolveExistingFileURIResolver()
-        throws TransformerException, IOException {
-        Source source = resolver
-            .resolve(EXISTING_RESOURCE, "");
-        assertTrue(source instanceof StreamSource);
-
-        String resolved = FileSystemUtils.read(((StreamSource) source)
-            .getInputStream());
-
-        ClassPathResource resource = new ClassPathResource(
-            EXISTING_RESOURCE);
-        String expected = FileSystemUtils.read(resource.getInputStream());
-        assertEquals(expected, resolved);
-    }
-
     /**
      * Resolves a non-existing file. Verifies that a TransformerException is
      * thrown.
      * 
      */
+    @Test
     public void testResolveNonExistingFileURIResolver() {
         try {
             resolver
@@ -92,6 +79,7 @@ public class ClasspathUriResolverTest extends TestCase {
      * @throws TransformerException
      * @throws IOException
      */
+    @Test
     public void testResolveExistingFileLSResourceResolver()
         throws TransformerException, IOException {
         LSInput source = resolver.resolveResource(null, null, "kees",
@@ -108,12 +96,39 @@ public class ClasspathUriResolverTest extends TestCase {
         String expected = FileSystemUtils.read(resource.getInputStream());
         assertEquals(expected, resolved);
     }
+    
+    /**
+     * Resolves an existing file using a base path. Verifies the file is resolved correctly.
+     * 
+     * @throws TransformerException
+     * @throws IOException
+     */
+    @Test
+    public void testResolveExistingFileLSResourceResolverUsingBasePath()
+        throws TransformerException, IOException {
+        
+        resolver = new ClasspathUriResolver(PREFIX);
+        LSInput source = resolver.resolveResource(null, null, "kees",
+            REPORT_TO_HTML_XSL, null);
+        assertNotNull(source);
+        
+        assertEquals("kees", source.getPublicId());
+        assertEquals(REPORT_TO_HTML_XSL, source.getSystemId());
+
+        String resolved = FileSystemUtils.read(source.getByteStream());
+
+        ClassPathResource resource = new ClassPathResource(
+            EXISTING_RESOURCE);
+        String expected = FileSystemUtils.read(resource.getInputStream());
+        assertEquals(expected, resolved);
+    }
 
     /**
      * Resolves a non-existing file. Verifies that a TransformerException is
      * thrown.
      * 
      */
+    @Test
     public void testResolveNonExistingFileLSResourceResolver() {
         LSInput input = resolver.resolveResource(null, null, "kees",
             NON_EXISTING_RESOURCE, null);