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

@@ -23,42 +23,51 @@
 package javax.xml.transform.ptests;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Result;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
+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.TransformerHandler;
 import javax.xml.transform.stream.StreamResult;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.CLASS_DIR;
 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.w3c.dom.Node;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
  * Test newTransformerHandler with a DOMSource and StreamResult set.
  */
-public class SAXTFactoryTest006 extends TransformerTestConst{
+public class SAXTFactoryTest006 extends JAXPFileBaseTest {
     /**
      * Unit test newTransformerHandler with a DOMSource.
+     * 
+     * @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.
+     * @throws ParserConfigurationException if a DocumentBuilder cannot be 
+     *         created which satisfies the configuration requested.
      */
     @Test
-    public void testcase01() {
+    public void testcase01() throws SAXException, IOException, 
+            ParserConfigurationException, TransformerConfigurationException {
         String outputFile = CLASS_DIR + "saxtf006.out";
         String goldFile = GOLDEN_DIR + "saxtf006GF.out";
         String xsltFile = XML_DIR + "citiesinclude.xsl";
         String xmlFile = XML_DIR + "cities.xml";
 

@@ -78,20 +87,9 @@
 
             Result result = new StreamResult(fos);
             handler.setResult(result);
             reader.setContentHandler(handler);
             reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (TransformerConfigurationException | ParserConfigurationException
-                | SAXException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }