--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest009.java 2014-12-31 11:40:10.788041242 -0800 +++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest009.java 2014-12-31 11:40:10.712041124 -0800 @@ -24,9 +24,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; @@ -37,9 +34,8 @@ import javax.xml.transform.sax.TemplatesHandler; 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.xml.sax.SAXException; @@ -48,15 +44,23 @@ /** * Test newTransformerHandler with a Template Handler along with a relative URI - * in the xslt file. + * in the style-sheet file. */ -public class SAXTFactoryTest009 { +public class SAXTFactoryTest009 extends JAXPFileBaseTest { /** * Test newTransformerHandler with a Template Handler along with a relative - * URI in the xslt file. + * URI in the style-sheet 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 + "saxtf009.out"; String goldFile = GOLDEN_DIR + "saxtf009GF.out"; String xsltFile = XML_DIR + "citiesinclude.xsl"; @@ -77,17 +81,7 @@ tfhandler.setResult(result); reader.setContentHandler(tfhandler); reader.parse(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); - } } + assertTrue(compareWithGold(goldFile, outputFile)); } }