test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java

@@ -36,11 +36,10 @@
 
 import javax.xml.catalog.CatalogException;
 import javax.xml.catalog.CatalogFeatures;
 import javax.xml.catalog.CatalogFeatures.Feature;
 import javax.xml.catalog.CatalogResolver;
-import javax.xml.catalog.CatalogUriResolver;
 
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*

@@ -91,11 +90,11 @@
      * For continue URI reference resolution, if no match is found,
      * it should continue the process.
      */
     @Test
     public void testContinueResolutionOnUriResolver() {
-        CatalogUriResolver resolver = createUriResolver(RESOLVE_CONTINUE);
+        CatalogResolver resolver = createUriResolver(RESOLVE_CONTINUE);
         resolver.resolve("http://remote/dtd/bob/docBobDummy.dtd", null);
         checkUriResolution(resolver, "http://remote/dtd/bob/docBob.dtd",
                 "http://local/base/dtd/docBobURI.dtd");
     }
 

@@ -121,14 +120,13 @@
 
     private CatalogResolver createEntityResolver(String resolve) {
         return catalogResolver(createFeature(resolve), CATALOG_SYSTEM);
     }
 
-    private CatalogUriResolver createUriResolver(String resolve) {
+    private CatalogResolver createUriResolver(String resolve) {
         return catalogUriResolver(createFeature(resolve), CATALOG_URI);
     }
 
     private CatalogFeatures createFeature(String resolve) {
         return builder().with(Feature.RESOLVE, resolve).build();
     }
 }
-