test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest013.java

*** 22,44 ****
   */
  package javax.xml.transform.ptests;
  
  import java.io.FileInputStream;
  import java.io.IOException;
- import java.nio.file.Files;
- import java.nio.file.Path;
- import java.nio.file.Paths;
  import javax.xml.transform.TransformerConfigurationException;
  import javax.xml.transform.TransformerFactory;
  import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
  import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
  import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
  import javax.xml.transform.sax.SAXTransformerFactory;
  import javax.xml.transform.sax.TemplatesHandler;
  import static jaxp.library.JAXPTestUtilities.compareWithGold;
- import static jaxp.library.JAXPTestUtilities.failCleanup;
- import static jaxp.library.JAXPTestUtilities.failUnexpected;
  import static org.testng.Assert.assertTrue;
  import org.testng.annotations.Test;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
  import org.xml.sax.XMLFilter;
--- 22,40 ----
   */
  package javax.xml.transform.ptests;
  
  import java.io.FileInputStream;
  import java.io.IOException;
  import javax.xml.transform.TransformerConfigurationException;
  import javax.xml.transform.TransformerFactory;
  import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
  import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
  import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
  import javax.xml.transform.sax.SAXTransformerFactory;
  import javax.xml.transform.sax.TemplatesHandler;
+ import jaxp.library.JAXPFileBaseTest;
  import static jaxp.library.JAXPTestUtilities.compareWithGold;
  import static org.testng.Assert.assertTrue;
  import org.testng.annotations.Test;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
  import org.xml.sax.XMLFilter;
*** 46,67 ****
  import org.xml.sax.helpers.XMLReaderFactory;
  
  /**
   * Test XMLFilter parse InputSource along with TemplatesHandler.
   */
! public class SAXTFactoryTest013 {
      /**
       * Unit test for TemplatesHandler setter/getter.
       */
      @Test
!     public  void testcase01() {
          String outputFile = CLASS_DIR + "saxtf013.out";
          String goldFile = GOLDEN_DIR + "saxtf013GF.out";
          String xsltFile = XML_DIR + "cities.xsl";
          String xmlFile = XML_DIR + "cities.xml";
! 
!         try {
              // The transformer will use a SAX parser as it's reader.
              XMLReader reader = XMLReaderFactory.createXMLReader();
  
              SAXTransformerFactory saxTFactory
                      = (SAXTransformerFactory) TransformerFactory.newInstance();
--- 42,70 ----
  import org.xml.sax.helpers.XMLReaderFactory;
  
  /**
   * Test XMLFilter parse InputSource along with TemplatesHandler.
   */
! public class SAXTFactoryTest013 extends JAXPFileBaseTest {
      /**
       * Unit test for TemplatesHandler setter/getter.
+      * 
+      * @throws SAXException If any parse errors occur.
+      * @throws IOException if the file exists but is a directory rather than
+      *         a regular file, does not exist but cannot be created, or cannot 
+      *         be opened for any other reason.
+      * @throws TransformerConfigurationException If for some reason the
+      *         TransformerHandler can not be created.
       */
      @Test
!     public void testcase01() throws IOException, SAXException, 
!             TransformerConfigurationException {
          String outputFile = CLASS_DIR + "saxtf013.out";
          String goldFile = GOLDEN_DIR + "saxtf013GF.out";
          String xsltFile = XML_DIR + "cities.xsl";
          String xmlFile = XML_DIR + "cities.xml";
!         try(FileInputStream fis = new FileInputStream(xmlFile)) {
              // The transformer will use a SAX parser as it's reader.
              XMLReader reader = XMLReaderFactory.createXMLReader();
  
              SAXTransformerFactory saxTFactory
                      = (SAXTransformerFactory) TransformerFactory.newInstance();
*** 73,94 ****
              reader.parse(xsltFile);
              XMLFilter filter
                      = saxTFactory.newXMLFilter(thandler.getTemplates());
              filter.setParent(reader);
  
!             filter.setContentHandler(
!                     new MyContentHandler(outputFile));
!             filter.parse(new InputSource(new FileInputStream(xmlFile)));
!             assertTrue(compareWithGold(goldFile, outputFile));
!         } catch (SAXException | IOException | TransformerConfigurationException ex) {
!             failUnexpected(ex);
!         } finally {
!             try {
!                 Path outputPath = Paths.get(outputFile);
!                 if(Files.exists(outputPath))
!                     Files.delete(outputPath);
!             } catch (IOException ex) {
!                 failCleanup(ex, outputFile);
!             }
          }
      }
  }
--- 76,86 ----
              reader.parse(xsltFile);
              XMLFilter filter
                      = saxTFactory.newXMLFilter(thandler.getTemplates());
              filter.setParent(reader);
  
!             filter.setContentHandler(new MyContentHandler(outputFile));
!             filter.parse(new InputSource(fis));
          }
+         assertTrue(compareWithGold(goldFile, outputFile));
      }
  }