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

*** 22,36 ****
   */
  
  package catalog;
  
  import static catalog.CatalogTestUtils.catalogUriResolver;
! import static catalog.ResolutionChecker.checkNoMatch;
  import static catalog.ResolutionChecker.checkUriResolution;
  
  import javax.xml.catalog.CatalogException;
- import javax.xml.catalog.CatalogUriResolver;
  
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  
--- 22,36 ----
   */
  
  package catalog;
  
  import static catalog.CatalogTestUtils.catalogUriResolver;
! import static catalog.ResolutionChecker.checkNoUriMatch;
  import static catalog.ResolutionChecker.checkUriResolution;
  
+ import javax.xml.catalog.CatalogResolver;
  import javax.xml.catalog.CatalogException;
  
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  
*** 86,98 ****
      /*
       * If no match is found, a CatalogException should be thrown.
       */
      @Test(expectedExceptions = CatalogException.class)
      public void testNoMatch() {
!         checkNoMatch(createResolver());
      }
  
!     private CatalogUriResolver createResolver() {
          return catalogUriResolver("uriSuffix.xml");
      }
  }
- 
--- 86,97 ----
      /*
       * If no match is found, a CatalogException should be thrown.
       */
      @Test(expectedExceptions = CatalogException.class)
      public void testNoMatch() {
!         checkNoUriMatch(createResolver());
      }
  
!     private CatalogResolver createResolver() {
          return catalogUriResolver("uriSuffix.xml");
      }
  }