OpenJDK / portola / portola
changeset 27982:3cafd24fcc3e
Merge
author | lana |
---|---|
date | Thu, 11 Dec 2014 12:27:55 -0800 |
parents | c9ea6014e6f2 52d636dec3f2 |
children | f5f19fe0e83b |
files | |
diffstat | 1 files changed, 8 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java Thu Dec 11 11:44:02 2014 -0800 +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java Thu Dec 11 12:27:55 2014 -0800 @@ -61,33 +61,25 @@ String xmlFile = XML_DIR + "TransformerFactoryTest.xml"; String xmlURI = "file:///" + XML_DIR; - try { + try (FileInputStream fis = new FileInputStream(xmlFile); + FileOutputStream fos = new FileOutputStream(outputFile);) { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = dbf.newDocumentBuilder(); - Document doc = db.parse(new FileInputStream(xmlFile), xmlURI); + Document doc = db.parse(fis, xmlURI); DOMSource domSource = new DOMSource(doc); domSource.setSystemId(xmlURI); - StreamResult streamResult =new StreamResult( - new FileOutputStream(outputFile)); + StreamResult streamResult = new StreamResult(fos); TransformerFactory tFactory = TransformerFactory.newInstance(); - Source s = tFactory.getAssociatedStylesheet(domSource,"screen", - "Modern",null); + Source s = tFactory.getAssociatedStylesheet(domSource, "screen", + "Modern", null); Transformer t = tFactory.newTransformer(); - t.transform(s,streamResult); + t.transform(s, streamResult); assertTrue(compareWithGold(goldFile, outputFile)); - }catch (IOException | ParserConfigurationException + } catch (IOException | ParserConfigurationException | TransformerException | SAXException ex) { failUnexpected(ex); - } finally { - try { - Path outputPath = Paths.get(outputFile); - if(Files.exists(outputPath)) - Files.delete(outputPath); - } catch (IOException ex) { - failCleanup(ex, outputFile); - } } } }