--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest003.java 2014-12-31 11:40:08.904038315 -0800 +++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest003.java 2014-12-31 11:40:08.830038200 -0800 @@ -25,9 +25,6 @@ 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; @@ -41,9 +38,8 @@ 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.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.Document; @@ -56,13 +52,23 @@ * Test newTransformerhandler() method which takes DOMSource as argument can * be set to XMLReader. */ -public class SAXTFactoryTest003 { +public class SAXTFactoryTest003 extends JAXPFileBaseTest { /** * Unit test for newTransformerhandler(Source). DcoumentBuilderFactory is * namespace awareness, DocumentBuilder parse xslt file as 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 IOException, SAXException, + TransformerConfigurationException, ParserConfigurationException { String outputFile = CLASS_DIR + "saxtf003.out"; String goldFile = GOLDEN_DIR + "saxtf003GF.out"; String xsltFile = XML_DIR + "cities.xsl"; @@ -85,18 +91,7 @@ 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)); } }