test/javax/xml/jaxp/unittest/catalog/CatalogTest.java

*** 22,31 ****
--- 22,32 ----
   */
  package catalog;
  
  import java.io.IOException;
  import java.nio.file.Paths;
+ 
  import javax.xml.catalog.Catalog;
  import javax.xml.catalog.CatalogException;
  import javax.xml.catalog.CatalogFeatures;
  import javax.xml.catalog.CatalogFeatures.Feature;
  import javax.xml.catalog.CatalogManager;
*** 33,45 ****
--- 34,50 ----
  import javax.xml.catalog.CatalogUriResolver;
  import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.parsers.SAXParser;
  import javax.xml.parsers.SAXParserFactory;
  import javax.xml.transform.Source;
+ 
+ import jaxp.library.JAXPTestUtilities;
+ 
  import org.testng.Assert;
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.DataProvider;
+ import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  import org.xml.sax.Attributes;
  import org.xml.sax.ErrorHandler;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
*** 48,57 ****
--- 53,63 ----
  
  /*
   * @bug 8081248, 8144966, 8146606, 8146237, 8151154, 8150969, 8151162, 8152527, 8154220
   * @summary Tests basic Catalog functions.
   */
+ @Listeners({jaxp.library.FilePolicy.class})
  public class CatalogTest {
      static final String KEY_FILES = "javax.xml.catalog.files";
  
      public String filepath;
  
*** 519,529 ****
  
  
      /**
       * SAX handler
       */
!     public class MyHandler extends DefaultHandler2 implements ErrorHandler {
  
          StringBuilder textContent = new StringBuilder();
          SAXParser saxParser;
  
          MyHandler(SAXParser saxParser) {
--- 525,536 ----
  
  
      /**
       * SAX handler
       */
!     @Listeners({jaxp.library.BasePolicy.class})
! public class MyHandler extends DefaultHandler2 implements ErrorHandler {
  
          StringBuilder textContent = new StringBuilder();
          SAXParser saxParser;
  
          MyHandler(SAXParser saxParser) {