aligned schema API with that of XSL transformation.

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

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 f406c69d5820bbc261e677160747194985c59c70..bc1c9cfc043a5500b8b8e64d4242629bc1223150 100644 (file)
--- a/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
+++ b/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
@@ -18,6 +18,8 @@ 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;
@@ -30,12 +32,14 @@ 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 {
+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;
@@ -47,8 +51,8 @@ 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();
     }
 
@@ -57,6 +61,7 @@ public class ClasspathUriResolverTest extends TestCase {
      * thrown.
      * 
      */
+    @Test
     public void testResolveNonExistingFileURIResolver() {
         try {
             resolver
@@ -74,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",
@@ -97,6 +103,7 @@ public class ClasspathUriResolverTest extends TestCase {
      * @throws TransformerException
      * @throws IOException
      */
+    @Test
     public void testResolveExistingFileLSResourceResolverUsingBasePath()
         throws TransformerException, IOException {
         
@@ -121,6 +128,7 @@ public class ClasspathUriResolverTest extends TestCase {
      * thrown.
      * 
      */
+    @Test
     public void testResolveNonExistingFileLSResourceResolver() {
         LSInput input = resolver.resolveResource(null, null, "kees",
             NON_EXISTING_RESOURCE, null);