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

@@ -22,23 +22,19 @@
  */
 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.SAXSource;
 import javax.xml.transform.sax.SAXTransformerFactory;
+import jaxp.library.JAXPFileBaseTest;
 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;

@@ -47,21 +43,28 @@
 
 /**
  * Test XMLFilter parse InputSource along with customized ContentHandler by
  * using SAX parser as it's reader.
  */
-public class SAXTFactoryTest012 {
+public class SAXTFactoryTest012 extends JAXPFileBaseTest {
     /**
      * Unit test for contentHandler 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() {
+    public void testcase01() throws SAXException, IOException, 
+            TransformerConfigurationException {
         String outputFile = CLASS_DIR + "saxtf012.out";
         String goldFile = GOLDEN_DIR + "saxtf012GF.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();
 
             InputSource is = new InputSource(new FileInputStream(xsltFile));
             SAXSource saxSource = new SAXSource();

@@ -76,18 +79,7 @@
             // Now, when you call transformer.parse, it will set itself as
             // the content handler for the parser object (it's "parent"), and
             // will then call the parse method on the parser.
             filter.parse(new InputSource(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);
-            }
-        }
     }
 }