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

*** 31,41 ****
  import static catalog.ResolutionChecker.checkSysIdResolution;
  import static catalog.ResolutionChecker.checkUriResolution;
  
  import javax.xml.catalog.CatalogException;
  import javax.xml.catalog.CatalogResolver;
- import javax.xml.catalog.CatalogUriResolver;
  
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  
--- 31,40 ----
*** 54,63 ****
--- 53,63 ----
  
      private static final String CATALOG_LOADCATALOGFILES = "loadCatalogFiles.xml";
      private static final String CATALOG_DUMMY = "dummy.xml";
  
      private static final String ID_ALICE = "http://remote/dtd/alice/docAlice.dtd";
+     private static final String ID_ALICE_URI = "http://remote/dtd/uri/alice/docAlice.dtd";
      private static final String ID_DUMMY = "http://remote/dtd/doc.dtd";
  
      @Test(dataProvider = "entityResolver")
      public void testMatchOnEntityResolver(CatalogResolver resolver) {
          checkSysIdResolution(resolver, ID_ALICE,
*** 77,88 ****
                  { catalogResolver(CATALOG_PUBLIC, CATALOG_DUMMY,
                          CATALOG_SYSTEM) } };
      }
  
      @Test(dataProvider = "uriResolver")
!     public void testMatchOnUriResolver(CatalogUriResolver resolver) {
!         checkUriResolution(resolver, ID_ALICE,
                  "http://local/dtd/docAliceURI.dtd");
      }
  
      @DataProvider(name = "uriResolver")
      public Object[][] uriResolver() {
--- 77,88 ----
                  { catalogResolver(CATALOG_PUBLIC, CATALOG_DUMMY,
                          CATALOG_SYSTEM) } };
      }
  
      @Test(dataProvider = "uriResolver")
!     public void testMatchOnUriResolver(CatalogResolver resolver) {
!         checkUriResolution(resolver, ID_ALICE_URI,
                  "http://local/dtd/docAliceURI.dtd");
      }
  
      @DataProvider(name = "uriResolver")
      public Object[][] uriResolver() {
*** 119,124 ****
                  // This catalog file set includes one catalog file, but this
                  // catalog defines a non-existing next catalog.
                  { new String[] { CATALOG_LOADCATALOGFILES } } };
      }
  }
- 
--- 119,123 ----