--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest001.java 2014-12-31 11:40:08.210037236 -0800 +++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest001.java 2014-12-31 11:40:08.135037120 -0800 @@ -25,9 +25,6 @@ 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.transform.Result; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; @@ -38,9 +35,8 @@ import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +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.SAXException; @@ -51,15 +47,23 @@ * Test newTransformerhandler() method which takes StreamSource as argument can * be set to XMLReader. */ -public class SAXTFactoryTest001 { +public class SAXTFactoryTest001 extends JAXPFileBaseTest { /** * SAXTFactory.newTransformerhandler() method which takes SAXSource as * argument can be set to XMLReader. SAXSource has input XML file as its * input source. XMLReader has a transformer handler which write out the * result to output file. Test verifies output file is same as golden file. + * + * @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 IOException, SAXException, + TransformerConfigurationException { String outputFile = CLASS_DIR + "saxtf001.out"; String goldFile = GOLDEN_DIR + "saxtf001GF.out"; String xsltFile = XML_DIR + "cities.xsl"; @@ -75,17 +79,7 @@ handler.setResult(result); reader.setContentHandler(handler); reader.parse(xmlFile); - assertTrue(compareWithGold(goldFile, outputFile)); - } catch (SAXException | TransformerConfigurationException | 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)); } }