Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java Mon Aug 31 04:21:04 2015 @@ -69,10 +69,9 @@ public class TXTParser extends AbstractP Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException { // Automatically detect the character encoding - AutoDetectReader reader = new AutoDetectReader( + try (AutoDetectReader reader = new AutoDetectReader( new CloseShieldInputStream(stream), metadata, - context.get(ServiceLoader.class, LOADER)); - try { + context.get(ServiceLoader.class, LOADER))) { Charset charset = reader.getCharset(); MediaType type = new MediaType(MediaType.TEXT_PLAIN, charset); metadata.set(Metadata.CONTENT_TYPE, type.toString()); @@ -93,8 +92,6 @@ public class TXTParser extends AbstractP xhtml.endElement("p"); xhtml.endDocument(); - } finally { - reader.close(); } }
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java Mon Aug 31 04:21:04 2015 @@ -52,12 +52,8 @@ public class TestParsers extends TikaTes File file = getResourceAsFile("/test-documents/testWORD.doc"); Parser parser = tika.getParser(); Metadata metadata = new Metadata(); - InputStream stream = new FileInputStream(file); - try { - parser.parse( - stream, new DefaultHandler(), metadata, new ParseContext()); - } finally { - stream.close(); + try (InputStream stream = new FileInputStream(file)) { + parser.parse(stream, new DefaultHandler(), metadata, new ParseContext()); } assertEquals("Sample Word Document", metadata.get(TikaCoreProperties.TITLE)); } @@ -71,12 +67,8 @@ public class TestParsers extends TikaTes .contains(expected)); Parser parser = tika.getParser(); Metadata metadata = new Metadata(); - InputStream stream = new FileInputStream(file); - try { - parser.parse( - stream, new DefaultHandler(), metadata, new ParseContext()); - } finally { - stream.close(); + try (InputStream stream = new FileInputStream(file)) { + parser.parse(stream, new DefaultHandler(), metadata, new ParseContext()); } assertEquals("Simple Excel document", metadata.get(TikaCoreProperties.TITLE)); } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java Mon Aug 31 04:21:04 2015 @@ -55,28 +55,24 @@ public class TestContainerAwareDetector assertTypeByNameAndData(dataFile, name, type, null); } private void assertTypeByNameAndData(String dataFile, String name, String typeFromDetector, String typeFromMagic) throws Exception { - TikaInputStream stream = TikaInputStream.get( - TestContainerAwareDetector.class.getResource( - "/test-documents/" + dataFile)); - try { - Metadata m = new Metadata(); - if (name != null) - m.add(Metadata.RESOURCE_NAME_KEY, name); - - // Mime Magic version is likely to be less precise - if (typeFromMagic != null) { - assertEquals( - MediaType.parse(typeFromMagic), - mimeTypes.detect(stream, m)); - } - - // All being well, the detector should get it perfect - assertEquals( - MediaType.parse(typeFromDetector), - detector.detect(stream, m)); - } finally { - stream.close(); - } + try (TikaInputStream stream = TikaInputStream.get( + TestContainerAwareDetector.class.getResource("/test-documents/" + dataFile))) { + Metadata m = new Metadata(); + if (name != null) + m.add(Metadata.RESOURCE_NAME_KEY, name); + + // Mime Magic version is likely to be less precise + if (typeFromMagic != null) { + assertEquals( + MediaType.parse(typeFromMagic), + mimeTypes.detect(stream, m)); + } + + // All being well, the detector should get it perfect + assertEquals( + MediaType.parse(typeFromDetector), + detector.detect(stream, m)); + } } @Test @@ -165,17 +161,13 @@ public class TestContainerAwareDetector @Test public void testOpenContainer() throws Exception { - TikaInputStream stream = TikaInputStream.get( - TestContainerAwareDetector.class.getResource( - "/test-documents/testPPT.ppt")); - try { + try (TikaInputStream stream = TikaInputStream.get( + TestContainerAwareDetector.class.getResource("/test-documents/testPPT.ppt"))) { assertNull(stream.getOpenContainer()); assertEquals( MediaType.parse("application/vnd.ms-powerpoint"), detector.detect(stream, new Metadata())); assertTrue(stream.getOpenContainer() instanceof NPOIFSFileSystem); - } finally { - stream.close(); } } @@ -306,13 +298,9 @@ public class TestContainerAwareDetector private void assertRemovalTempfiles(String fileName) throws Exception { int numberOfTempFiles = countTemporaryFiles(); - TikaInputStream stream = TikaInputStream.get( - TestContainerAwareDetector.class.getResource( - "/test-documents/" + fileName)); - try { + try (TikaInputStream stream = TikaInputStream.get( + TestContainerAwareDetector.class.getResource("/test-documents/" + fileName))) { detector.detect(stream, new Metadata()); - } finally { - stream.close(); } assertEquals(numberOfTempFiles, countTemporaryFiles()); @@ -354,10 +342,8 @@ public class TestContainerAwareDetector private TikaInputStream getTruncatedFile(String name, int n) throws IOException { - InputStream input = - TestContainerAwareDetector.class.getResourceAsStream( - "/test-documents/" + name); - try { + try (InputStream input = TestContainerAwareDetector.class.getResourceAsStream( + "/test-documents/" + name)) { byte[] bytes = new byte[n]; int m = 0; while (m < bytes.length) { @@ -369,8 +355,6 @@ public class TestContainerAwareDetector } } return TikaInputStream.get(bytes); - } finally { - input.close(); } } @@ -379,50 +363,37 @@ public class TestContainerAwareDetector // First up a truncated OOXML (zip) file // With only the data supplied, the best we can do is the container - TikaInputStream xlsx = getTruncatedFile("testEXCEL.xlsx", 300); Metadata m = new Metadata(); - try { + try (TikaInputStream xlsx = getTruncatedFile("testEXCEL.xlsx", 300)) { assertEquals( MediaType.application("x-tika-ooxml"), detector.detect(xlsx, m)); - } finally { - xlsx.close(); } // With truncated data + filename, we can use the filename to specialise - xlsx = getTruncatedFile("testEXCEL.xlsx", 300); m = new Metadata(); m.add(Metadata.RESOURCE_NAME_KEY, "testEXCEL.xlsx"); - try { + try (TikaInputStream xlsx = getTruncatedFile("testEXCEL.xlsx", 300)) { assertEquals( MediaType.application("vnd.openxmlformats-officedocument.spreadsheetml.sheet"), detector.detect(xlsx, m)); - } finally { - xlsx.close(); } - // Now a truncated OLE2 file - TikaInputStream xls = getTruncatedFile("testEXCEL.xls", 400); m = new Metadata(); - try { + try (TikaInputStream xls = getTruncatedFile("testEXCEL.xls", 400)) { assertEquals( MediaType.application("x-tika-msoffice"), detector.detect(xls, m)); - } finally { - xls.close(); } // Finally a truncated OLE2 file, with a filename available - xls = getTruncatedFile("testEXCEL.xls", 400); m = new Metadata(); m.add(Metadata.RESOURCE_NAME_KEY, "testEXCEL.xls"); - try { + try (TikaInputStream xls = getTruncatedFile("testEXCEL.xls", 400)) { assertEquals( MediaType.application("vnd.ms-excel"), detector.detect(xls, m)); - } finally { - xls.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java Mon Aug 31 04:21:04 2015 @@ -974,15 +974,12 @@ public class TestMimeTypes { } private void assertType(String expected, String filename) throws Exception { - InputStream stream = TestMimeTypes.class.getResourceAsStream( - "/test-documents/" + filename); - assertNotNull("Test file not found: " + filename, stream); - try { + try (InputStream stream = TestMimeTypes.class.getResourceAsStream( + "/test-documents/" + filename)) { + assertNotNull("Test file not found: " + filename, stream); Metadata metadata = new Metadata(); metadata.set(Metadata.RESOURCE_NAME_KEY, filename); assertEquals(expected, repo.detect(stream, metadata).toString()); - } finally { - stream.close(); } } @@ -995,26 +992,20 @@ public class TestMimeTypes { private void assertTypeByData(String expected, String filename) throws IOException { - InputStream stream = TestMimeTypes.class.getResourceAsStream( - "/test-documents/" + filename); - assertNotNull("Test file not found: " + filename, stream); - try { + try (InputStream stream = TestMimeTypes.class.getResourceAsStream( + "/test-documents/" + filename)) { + assertNotNull("Test file not found: " + filename, stream); Metadata metadata = new Metadata(); assertEquals(expected, repo.detect(stream, metadata).toString()); - } finally { - stream.close(); } } private void assertTypeByData(String expected, byte[] data) throws IOException { - InputStream stream = new ByteArrayInputStream(data); - try { - Metadata metadata = new Metadata(); - assertEquals(expected, repo.detect(stream, metadata).toString()); - } finally { - stream.close(); - } + try (InputStream stream = new ByteArrayInputStream(data)) { + Metadata metadata = new Metadata(); + assertEquals(expected, repo.detect(stream, metadata).toString()); + } } private void assertTypeDetection(String filename, String type) @@ -1035,15 +1026,12 @@ public class TestMimeTypes { } private MediaType getTypeByNameAndData(String filename) throws IOException { - InputStream stream = TestMimeTypes.class.getResourceAsStream( - "/test-documents/" + filename); - assertNotNull("Test document not found: " + filename, stream); - try { - Metadata metadata = new Metadata(); - metadata.set(Metadata.RESOURCE_NAME_KEY, filename); - return repo.detect(stream, metadata); - } finally { - stream.close(); - } + try (InputStream stream = TestMimeTypes.class.getResourceAsStream( + "/test-documents/" + filename)) { + assertNotNull("Test document not found: " + filename, stream); + Metadata metadata = new Metadata(); + metadata.set(Metadata.RESOURCE_NAME_KEY, filename); + return repo.detect(stream, metadata); + } } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java Mon Aug 31 04:21:04 2015 @@ -82,16 +82,11 @@ public class AutoDetectParserTest { * @throws IOException */ private void assertAutoDetect(TestParams tp) throws Exception { - - InputStream input = - AutoDetectParserTest.class.getResourceAsStream(tp.resourceRealName); - - if (input == null) { - fail("Could not open stream from specified resource: " - + tp.resourceRealName); - } - - try { + try (InputStream input = AutoDetectParserTest.class.getResourceAsStream(tp.resourceRealName)) { + if (input == null) { + fail("Could not open stream from specified resource: " + + tp.resourceRealName); + } Metadata metadata = new Metadata(); metadata.set(Metadata.RESOURCE_NAME_KEY, tp.resourceStatedName); metadata.set(Metadata.CONTENT_TYPE, tp.statedType); @@ -102,11 +97,9 @@ public class AutoDetectParserTest { tp.realType, metadata.get(Metadata.CONTENT_TYPE)); if (tp.expectedContentFragment != null) { - assertTrue("Expected content not found: " + tp, - handler.toString().contains(tp.expectedContentFragment)); + assertTrue("Expected content not found: " + tp, + handler.toString().contains(tp.expectedContentFragment)); } - } finally { - input.close(); } } @@ -263,22 +256,17 @@ public class AutoDetectParserTest { */ @Test public void testZipBombPrevention() throws Exception { - InputStream tgz = AutoDetectParserTest.class.getResourceAsStream( - "/test-documents/TIKA-216.tgz"); - try { + try (InputStream tgz = AutoDetectParserTest.class.getResourceAsStream( + "/test-documents/TIKA-216.tgz")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(-1); new AutoDetectParser(tika).parse(tgz, handler, metadata); fail("Zip bomb was not detected"); } catch (TikaException e) { // expected - } finally { - tgz.close(); } - } - /** * Make sure XML parse errors don't trigger ZIP bomb detection. * @@ -339,45 +327,40 @@ public class AutoDetectParserTest { // Have each file parsed, and check for (int i=0; i<testFiles.length; i++) { - String file = testFiles[i]; - InputStream input = AutoDetectParserTest.class.getResourceAsStream( - "/test-documents/"+file); - - if (input == null) { - fail("Could not find test file " + file); - } - - try { - Metadata metadata = new Metadata(); - ContentHandler handler = new BodyContentHandler(); - new AutoDetectParser(tika).parse(input, handler, metadata); - - assertEquals("Incorrect content type for " + file, - mediaTypes[i].toString(), metadata.get(Metadata.CONTENT_TYPE)); - - // Check some of the common metadata - // Old style metadata - assertEquals("Test Artist", metadata.get(Metadata.AUTHOR)); - assertEquals("Test Title", metadata.get(Metadata.TITLE)); - // New style metadata - assertEquals("Test Artist", metadata.get(TikaCoreProperties.CREATOR)); - assertEquals("Test Title", metadata.get(TikaCoreProperties.TITLE)); - - // Check some of the XMPDM metadata - if (! file.endsWith(".opus")) { - assertEquals("Test Album", metadata.get(XMPDM.ALBUM)); - } - assertEquals("Test Artist", metadata.get(XMPDM.ARTIST)); - assertEquals("Stereo", metadata.get(XMPDM.AUDIO_CHANNEL_TYPE)); - assertEquals("44100", metadata.get(XMPDM.AUDIO_SAMPLE_RATE)); - - // Check some of the text - String content = handler.toString(); - assertTrue(content.contains("Test Title")); - assertTrue(content.contains("Test Artist")); - } finally { - input.close(); - } + String file = testFiles[i]; + try (InputStream input = AutoDetectParserTest.class.getResourceAsStream( + "/test-documents/" + file)) { + if (input == null) { + fail("Could not find test file " + file); + } + Metadata metadata = new Metadata(); + ContentHandler handler = new BodyContentHandler(); + new AutoDetectParser(tika).parse(input, handler, metadata); + + assertEquals("Incorrect content type for " + file, + mediaTypes[i].toString(), metadata.get(Metadata.CONTENT_TYPE)); + + // Check some of the common metadata + // Old style metadata + assertEquals("Test Artist", metadata.get(Metadata.AUTHOR)); + assertEquals("Test Title", metadata.get(Metadata.TITLE)); + // New style metadata + assertEquals("Test Artist", metadata.get(TikaCoreProperties.CREATOR)); + assertEquals("Test Title", metadata.get(TikaCoreProperties.TITLE)); + + // Check some of the XMPDM metadata + if (!file.endsWith(".opus")) { + assertEquals("Test Album", metadata.get(XMPDM.ALBUM)); + } + assertEquals("Test Artist", metadata.get(XMPDM.ARTIST)); + assertEquals("Stereo", metadata.get(XMPDM.AUDIO_CHANNEL_TYPE)); + assertEquals("44100", metadata.get(XMPDM.AUDIO_SAMPLE_RATE)); + + // Check some of the text + String content = handler.toString(); + assertTrue(content.contains("Test Title")); + assertTrue(content.contains("Test Artist")); + } } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java Mon Aug 31 04:21:04 2015 @@ -87,9 +87,8 @@ public class ParsingReaderTest { Metadata metadata = new Metadata(); InputStream stream = ParsingReaderTest.class.getResourceAsStream( "/test-documents/testEXCEL.xls"); - Reader reader = new ParsingReader( - new AutoDetectParser(), stream, metadata, new ParseContext()); - try { + try (Reader reader = new ParsingReader( + new AutoDetectParser(), stream, metadata, new ParseContext())) { // Metadata should already be available assertEquals("Simple Excel document", metadata.get(TikaCoreProperties.TITLE)); // Check that the internal buffering isn't broken @@ -99,8 +98,6 @@ public class ParsingReaderTest { assertEquals('i', (char) reader.read()); assertEquals('l', (char) reader.read()); assertEquals('1', (char) reader.read()); - } finally { - reader.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java Mon Aug 31 04:21:04 2015 @@ -85,12 +85,8 @@ public class TestChmExtraction { @Test public void testExtractChmEntries() throws TikaException, IOException{ for (String fileName : files) { - InputStream stream = - TestChmExtraction.class.getResourceAsStream(fileName); - try { + try (InputStream stream = TestChmExtraction.class.getResourceAsStream(fileName)) { testExtractChmEntry(stream); - } finally { - stream.close(); } } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java Mon Aug 31 04:21:04 2015 @@ -44,11 +44,8 @@ public class TestParameters { private static byte[] readResource(String name) { try { - InputStream stream = TestParameters.class.getResourceAsStream(name); - try { + try (InputStream stream = TestParameters.class.getResourceAsStream(name)) { return IOUtils.toByteArray(stream); - } finally { - stream.close(); } } catch (IOException e) { throw new RuntimeException(e); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java Mon Aug 31 04:21:04 2015 @@ -31,9 +31,8 @@ import org.xml.sax.ContentHandler; public class Pkcs7ParserTest extends TikaTest { public void testDetachedSignature() throws Exception { - InputStream input = Pkcs7ParserTest.class.getResourceAsStream( - "/test-documents/testDetached.p7s"); - try { + try (InputStream input = Pkcs7ParserTest.class.getResourceAsStream( + "/test-documents/testDetached.p7s")) { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); new Pkcs7Parser().parse(input, handler, metadata, new ParseContext()); @@ -41,8 +40,6 @@ public class Pkcs7ParserTest extends Tik fail("should not get NPE"); } catch (TikaException te) { assertTrue(te.toString().contains("cannot parse detached pkcs7 signature")); - } finally { - input.close(); } } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java Mon Aug 31 04:21:04 2015 @@ -16,10 +16,6 @@ */ package org.apache.tika.parser.dif; -import static org.junit.Assert.assertEquals; - -import java.io.InputStream; - import org.apache.tika.TikaTest; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; @@ -28,6 +24,10 @@ import org.apache.tika.sax.BodyContentHa import org.junit.Test; import org.xml.sax.ContentHandler; +import java.io.InputStream; + +import static org.junit.Assert.assertEquals; + public class DIFParserTest extends TikaTest { @Test @@ -36,12 +36,9 @@ public class DIFParserTest extends TikaT ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = DIFParser.class - .getResourceAsStream("/test-documents/Zamora2010.dif"); - try { + try (InputStream stream = DIFParser.class.getResourceAsStream( + "/test-documents/Zamora2010.dif")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } assertEquals(metadata.get("DIF-Entry_ID"),"00794186-48f9-11e3-9dcb-00c0f03d5b7c"); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java Mon Aug 31 04:21:04 2015 @@ -68,24 +68,21 @@ public class DWGParserTest { @Test public void testDWG2010CustomPropertiesParser() throws Exception { // Check that standard parsing works - InputStream input = DWGParserTest.class.getResourceAsStream( + InputStream testInput = DWGParserTest.class.getResourceAsStream( "/test-documents/testDWG2010_custom_props.dwg"); - testParser(input); + testParser(testInput); // Check that custom properties with alternate padding work - input = DWGParserTest.class.getResourceAsStream( - "/test-documents/testDWG2010_custom_props.dwg"); - try { + try (InputStream input = DWGParserTest.class.getResourceAsStream( + "/test-documents/testDWG2010_custom_props.dwg")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); new DWGParser().parse(input, handler, metadata, null); - + assertEquals("valueforcustomprop1", metadata.get("customprop1")); assertEquals("valueforcustomprop2", metadata.get("customprop2")); - } finally { - input.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java Mon Aug 31 04:21:04 2015 @@ -42,13 +42,10 @@ public class EnviHeaderParserTest { ToXMLContentHandler handler = new ToXMLContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = EnviHeaderParser.class - .getResourceAsStream("/test-documents/envi_test_header.hdr"); - assertNotNull("Test ENVI file not found", stream); - try { + try (InputStream stream = EnviHeaderParser.class.getResourceAsStream( + "/test-documents/envi_test_header.hdr")) { + assertNotNull("Test ENVI file not found", stream); parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } // Check content of test file Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java Mon Aug 31 04:21:04 2015 @@ -32,9 +32,8 @@ public class EpubParserTest { @Test public void testXMLParser() throws Exception { - InputStream input = EpubParserTest.class.getResourceAsStream( - "/test-documents/testEPUB.epub"); - try { + try (InputStream input = EpubParserTest.class.getResourceAsStream( + "/test-documents/testEPUB.epub")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); new EpubParser().parse(input, handler, metadata, new ParseContext()); @@ -53,8 +52,6 @@ public class EpubParserTest { assertContains("First item", content); assertContains("The previous headings were subchapters", content); assertContains("Table data", content); - } finally { - input.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java Mon Aug 31 04:21:04 2015 @@ -30,9 +30,8 @@ public class ExecutableParserTest { @Test public void testWin32Parser() throws Exception { - InputStream input = ExecutableParserTest.class.getResourceAsStream( - "/test-documents/testWindows-x86-32.exe"); - try { + try (InputStream input = ExecutableParserTest.class.getResourceAsStream( + "/test-documents/testWindows-x86-32.exe")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); new ExecutableParser().parse(input, handler, metadata, new ParseContext()); @@ -41,49 +40,44 @@ public class ExecutableParserTest { metadata.get(Metadata.CONTENT_TYPE)); assertEquals("2012-05-13T13:40:11Z", metadata.get(Metadata.CREATION_DATE)); - - assertEquals(ExecutableParser.MACHINE_x86_32, + + assertEquals(ExecutableParser.MACHINE_x86_32, metadata.get(ExecutableParser.MACHINE_TYPE)); - assertEquals("Little", + assertEquals("Little", metadata.get(ExecutableParser.ENDIAN)); - assertEquals("32", + assertEquals("32", metadata.get(ExecutableParser.ARCHITECTURE_BITS)); - assertEquals("Windows", + assertEquals("Windows", metadata.get(ExecutableParser.PLATFORM)); String content = handler.toString(); assertEquals("", content); // No text yet - } finally { - input.close(); } } @Test public void testElfParser_x86_32() throws Exception { - InputStream input = ExecutableParserTest.class.getResourceAsStream( - "/test-documents/testLinux-x86-32"); - try { - Metadata metadata = new Metadata(); - ContentHandler handler = new BodyContentHandler(); - new ExecutableParser().parse(input, handler, metadata, new ParseContext()); - - assertEquals("application/x-executable", - metadata.get(Metadata.CONTENT_TYPE)); - - assertEquals(ExecutableParser.MACHINE_x86_32, - metadata.get(ExecutableParser.MACHINE_TYPE)); - assertEquals("Little", - metadata.get(ExecutableParser.ENDIAN)); - assertEquals("32", - metadata.get(ExecutableParser.ARCHITECTURE_BITS)); -// assertEquals("Linux", + try (InputStream input = ExecutableParserTest.class.getResourceAsStream( + "/test-documents/testLinux-x86-32")) { + Metadata metadata = new Metadata(); + ContentHandler handler = new BodyContentHandler(); + new ExecutableParser().parse(input, handler, metadata, new ParseContext()); + + assertEquals("application/x-executable", + metadata.get(Metadata.CONTENT_TYPE)); + + assertEquals(ExecutableParser.MACHINE_x86_32, + metadata.get(ExecutableParser.MACHINE_TYPE)); + assertEquals("Little", + metadata.get(ExecutableParser.ENDIAN)); + assertEquals("32", + metadata.get(ExecutableParser.ARCHITECTURE_BITS)); +// assertEquals("Linux", // metadata.get(ExecutableParser.PLATFORM)); - String content = handler.toString(); - assertEquals("", content); // No text yet - } finally { - input.close(); - } + String content = handler.toString(); + assertEquals("", content); // No text yet + } } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java Mon Aug 31 04:21:04 2015 @@ -31,9 +31,8 @@ import org.xml.sax.ContentHandler; public class FeedParserTest { @Test public void testRSSParser() throws Exception { - InputStream input = FeedParserTest.class - .getResourceAsStream("/test-documents/rsstest.rss"); - try { + try (InputStream input = FeedParserTest.class.getResourceAsStream( + "/test-documents/rsstest.rss")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); ParseContext context = new ParseContext(); @@ -48,18 +47,14 @@ public class FeedParserTest { assertEquals("TestChannel", metadata.get(TikaCoreProperties.TITLE)); // TODO find a way of testing the paragraphs and anchors - - } finally { - input.close(); } } @Test public void testAtomParser() throws Exception { - InputStream input = FeedParserTest.class - .getResourceAsStream("/test-documents/testATOM.atom"); - try { + try (InputStream input = FeedParserTest.class.getResourceAsStream( + "/test-documents/testATOM.atom")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); ParseContext context = new ParseContext(); @@ -74,8 +69,6 @@ public class FeedParserTest { assertEquals("Test Atom Feed", metadata.get(TikaCoreProperties.TITLE)); // TODO Check some more - } finally { - input.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/font/FontParsersTest.java Mon Aug 31 04:21:04 2015 @@ -46,14 +46,10 @@ public class FontParsersTest { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); ParseContext context = new ParseContext(); - TikaInputStream stream = TikaInputStream.get( - FontParsersTest.class.getResource( - "/test-documents/testAFM.afm")); - try { + try (TikaInputStream stream = TikaInputStream.get( + FontParsersTest.class.getResource("/test-documents/testAFM.afm"))) { parser.parse(stream, handler, metadata, context); - } finally { - stream.close(); } assertEquals("application/x-font-adobe-metric", metadata.get(Metadata.CONTENT_TYPE)); @@ -84,14 +80,10 @@ public class FontParsersTest { //Open Sans font is ASL 2.0 according to //http://www.google.com/fonts/specimen/Open+Sans //...despite the copyright in the file's metadata. - TikaInputStream stream = TikaInputStream.get( - FontParsersTest.class.getResource( - "/test-documents/testTrueType3.ttf")); - - try { + + try (TikaInputStream stream = TikaInputStream.get( + FontParsersTest.class.getResource("/test-documents/testTrueType3.ttf"))) { parser.parse(stream, handler, metadata, context); - } finally { - stream.close(); } assertEquals("application/x-font-ttf", metadata.get(Metadata.CONTENT_TYPE)); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/grib/GribParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/grib/GribParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/grib/GribParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/grib/GribParserTest.java Mon Aug 31 04:21:04 2015 @@ -41,11 +41,8 @@ public class GribParserTest { Parser parser = new GribParser(); Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); - InputStream stream = GribParser.class.getResourceAsStream("/test-documents/gdas1.forecmwf.2014062612.grib2"); - try { + try (InputStream stream = GribParser.class.getResourceAsStream("/test-documents/gdas1.forecmwf.2014062612.grib2")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } assertNotNull(metadata); String content = handler.toString(); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java Mon Aug 31 04:21:04 2015 @@ -57,12 +57,8 @@ public class HDFParserTest { * ftp://acdisc.gsfc.nasa.gov/data/s4pa///Aura_MLS_Level2/ML2O3.002//2009 * /MLS-Aura_L2GP-O3_v02-23-c01_2009d122.he5 */ - InputStream stream = HDFParser.class - .getResourceAsStream("/test-documents/test.he5"); - try { + try (InputStream stream = HDFParser.class.getResourceAsStream("/test-documents/test.he5")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } assertNotNull(metadata); @@ -83,13 +79,9 @@ public class HDFParserTest { * * http://www.hdfgroup.org/training/hdf4_chunking/Chunkit/bin/input54kmdata.hdf */ - InputStream stream = HDFParser.class - .getResourceAsStream("/test-documents/test.hdf"); - try { - parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); - } + try (InputStream stream = HDFParser.class.getResourceAsStream("/test-documents/test.hdf")) { + parser.parse(stream, handler, metadata, new ParseContext()); + } assertNotNull(metadata); assertEquals("Direct read of HDF4 file through CDM library", metadata.get("_History")); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java Mon Aug 31 04:21:04 2015 @@ -67,8 +67,7 @@ public class HtmlParserTest { final StringWriter name = new StringWriter(); ContentHandler body = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = HtmlParserTest.class.getResourceAsStream(path); - try { + try (InputStream stream = HtmlParserTest.class.getResourceAsStream(path)) { ContentHandler link = new DefaultHandler() { @Override public void startElement( @@ -86,8 +85,6 @@ public class HtmlParserTest { new HtmlParser().parse( stream, new TeeContentHandler(body, link), metadata, new ParseContext()); - } finally { - stream.close(); } assertEquals( Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java Mon Aug 31 04:21:04 2015 @@ -32,9 +32,8 @@ public class iBooksParserTest { @Test public void testiBooksParser() throws Exception { - InputStream input = iBooksParserTest.class.getResourceAsStream( - "/test-documents/testiBooks.ibooks"); - try { + try (InputStream input = iBooksParserTest.class.getResourceAsStream( + "/test-documents/testiBooks.ibooks")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); new EpubParser().parse(input, handler, metadata, new ParseContext()); @@ -57,8 +56,6 @@ public class iBooksParserTest { assertContains("Table data", content); assertContains("Lorem ipsum dolor rutur amet", content); */ - } finally { - input.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java Mon Aug 31 04:21:04 2015 @@ -41,14 +41,9 @@ public class ISArchiveParserTest { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); ParseContext context = new ParseContext(); - InputStream stream = null; - try { - stream = ISArchiveParserTest.class.getResourceAsStream(path); + try (InputStream stream = ISArchiveParserTest.class.getResourceAsStream(path)) { parser.parse(stream, handler, metadata, context); } - finally { - stream.close(); - } // INVESTIGATION assertEquals("Invalid Investigation Identifier", "BII-I-1", metadata.get("Investigation Identifier")); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java Mon Aug 31 04:21:04 2015 @@ -101,17 +101,13 @@ public class SQLite3ParserTest extends T @Test public void testSpacesInBodyContentHandler() throws Exception { Parser p = new AutoDetectParser(); - InputStream stream = null; Metadata metadata = new Metadata(); metadata.set(Metadata.RESOURCE_NAME_KEY, TEST_FILE_NAME); ContentHandler handler = new BodyContentHandler(-1); ParseContext ctx = new ParseContext(); ctx.set(Parser.class, p); - try { - stream = getResourceAsStream(TEST_FILE1); + try (InputStream stream = getResourceAsStream(TEST_FILE1)) { p.parse(stream, handler, metadata, ctx); - } finally { - stream.close(); } String s = handler.toString(); assertContains("0\t2.3\t2.4\tlorem", s); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java Mon Aug 31 04:21:04 2015 @@ -362,15 +362,10 @@ public class RFC822ParserTest extends Ti @Test public void testGetAttachmentsAsEmbeddedResources() throws Exception { TrackingHandler tracker = new TrackingHandler(); - TikaInputStream tis = null; ContainerExtractor ex = new ParserContainerExtractor(); - try { - tis = TikaInputStream.get(getStream("test-documents/testRFC822-multipart")); + try (TikaInputStream tis = TikaInputStream.get(getStream("test-documents/testRFC822-multipart"))) { assertEquals(true, ex.isSupported(tis)); ex.extract(tis, ex, tracker); - } finally { - if (tis != null) - tis.close(); } // Check we found all 3 parts Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mat/MatParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mat/MatParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mat/MatParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mat/MatParserTest.java Mon Aug 31 04:21:04 2015 @@ -39,12 +39,8 @@ public class MatParserTest { Metadata metadata = new Metadata(); String path = "/test-documents/breidamerkurjokull_radar_profiles_2009.mat"; - InputStream stream = MatParser.class.getResourceAsStream(path); - - try { + try (InputStream stream = MatParser.class.getResourceAsStream(path)) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } // Check Metadata @@ -73,12 +69,8 @@ public class MatParserTest { Metadata metadata = new Metadata(); String path = "/test-documents/test_mat_text.mat"; - InputStream stream = MatParser.class.getResourceAsStream(path); - - try { + try (InputStream stream = MatParser.class.getResourceAsStream(path)) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } // Check Content Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java Mon Aug 31 04:21:04 2015 @@ -59,12 +59,9 @@ public class MboxParserTest { public void testSimple() throws Exception { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = getStream("/test-documents/simple.mbox"); - try { + try (InputStream stream = getStream("/test-documents/simple.mbox")) { mboxParser.parse(stream, handler, metadata, recursingContext); - } finally { - stream.close(); } String content = handler.toString(); @@ -88,12 +85,9 @@ public class MboxParserTest { public void testHeaders() throws Exception { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = getStream("/test-documents/headers.mbox"); - try { + try (InputStream stream = getStream("/test-documents/headers.mbox")) { mboxParser.parse(stream, handler, metadata, recursingContext); - } finally { - stream.close(); } assertContains("Test content", handler.toString()); @@ -114,12 +108,9 @@ public class MboxParserTest { public void testMultilineHeader() throws Exception { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = getStream("/test-documents/multiline.mbox"); - try { + try (InputStream stream = getStream("/test-documents/multiline.mbox")) { mboxParser.parse(stream, handler, metadata, recursingContext); - } finally { - stream.close(); } assertEquals("Nb. Of mails", 1, mboxParser.getTrackingMetadata().size()); @@ -132,12 +123,9 @@ public class MboxParserTest { public void testQuoted() throws Exception { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = getStream("/test-documents/quoted.mbox"); - try { + try (InputStream stream = getStream("/test-documents/quoted.mbox")) { mboxParser.parse(stream, handler, metadata, recursingContext); - } finally { - stream.close(); } assertContains("Test content", handler.toString()); @@ -148,12 +136,9 @@ public class MboxParserTest { public void testComplex() throws Exception { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = getStream("/test-documents/complex.mbox"); - try { + try (InputStream stream = getStream("/test-documents/complex.mbox")) { mboxParser.parse(stream, handler, metadata, recursingContext); - } finally { - stream.close(); } assertEquals("Nb. Of mails", 3, mboxParser.getTrackingMetadata().size()); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java Mon Aug 31 04:21:04 2015 @@ -57,8 +57,7 @@ public abstract class AbstractPOIContain } protected TrackingHandler process(String filename, ContainerExtractor extractor, boolean recurse) throws Exception { - TikaInputStream stream = getTestFile(filename); - try { + try (TikaInputStream stream = getTestFile(filename)) { assertEquals(true, extractor.isSupported(stream)); // Process it @@ -71,8 +70,6 @@ public abstract class AbstractPOIContain // So they can check what happened return handler; - } finally { - stream.close(); } } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java Mon Aug 31 04:21:04 2015 @@ -45,9 +45,8 @@ public class ExcelParserTest { @Test @SuppressWarnings("deprecation") // Checks legacy Tika-1.0 style metadata keys public void testExcelParser() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL.xls")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); ParseContext context = new ParseContext(); @@ -77,16 +76,13 @@ public class ExcelParserTest { assertNotContained("9.0", content); assertContains("196", content); assertNotContained("196.0", content); - } finally { - input.close(); } } @Test public void testExcelParserFormatting() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL-formats.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL-formats.xls")) { Metadata metadata = new Metadata(); ParseContext context = new ParseContext(); context.set(Locale.class, Locale.US); @@ -150,16 +146,13 @@ public class ExcelParserTest { assertContains("At 4:20 AM on Thursday May 17, 2007", content); **************************************************************************/ - } finally { - input.close(); } } @Test public void testExcelParserPassword() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL_protected_passtika.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL_protected_passtika.xls")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); ParseContext context = new ParseContext(); @@ -168,14 +161,11 @@ public class ExcelParserTest { fail("Document is encrypted, shouldn't parse"); } catch (EncryptedDocumentException e) { // Good - } finally { - input.close(); } // Try again, this time with the password - input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL_protected_passtika.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL_protected_passtika.xls")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); ParseContext context = new ParseContext(); @@ -199,8 +189,6 @@ public class ExcelParserTest { String content = handler.toString(); assertContains("This is an Encrypted Excel spreadsheet", content); assertNotContained("9.0", content); - } finally { - input.close(); } } @@ -209,9 +197,8 @@ public class ExcelParserTest { */ @Test public void testExcelParserCharts() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL-charts.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL-charts.xls")) { Metadata metadata = new Metadata(); ParseContext context = new ParseContext(); context.set(Locale.class, Locale.US); @@ -240,16 +227,13 @@ public class ExcelParserTest { // The third sheet has some text assertContains("Sheet2", content); assertContains("dingdong", content); - } finally { - input.close(); } } @Test public void testJXL() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/jxl.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/jxl.xls")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(-1); ParseContext context = new ParseContext(); @@ -261,16 +245,13 @@ public class ExcelParserTest { metadata.get(Metadata.CONTENT_TYPE)); String content = handler.toString(); assertContains("Number Formats", content); - } finally { - input.close(); } } @Test public void testWorksSpreadsheet70() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testWORKSSpreadsheet7.0.xlr"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testWORKSSpreadsheet7.0.xlr")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(-1); ParseContext context = new ParseContext(); @@ -279,8 +260,6 @@ public class ExcelParserTest { String content = handler.toString(); assertContains("Microsoft Works", content); - } finally { - input.close(); } } @@ -294,18 +273,15 @@ public class ExcelParserTest { Detector detector = new DefaultDetector(); AutoDetectParser parser = new AutoDetectParser(); - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL.xlsb"); Metadata m = new Metadata(); m.add(Metadata.RESOURCE_NAME_KEY, "excel.xlsb"); // Should be detected correctly - MediaType type = null; - try { + MediaType type; + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL.xlsb")) { type = detector.detect(input, m); assertEquals("application/vnd.ms-excel.sheet.binary.macroenabled.12", type.toString()); - } finally { - input.close(); } // OfficeParser won't handle it @@ -315,9 +291,7 @@ public class ExcelParserTest { assertEquals(false, (new OOXMLParser()).getSupportedTypes(new ParseContext()).contains(type)); // AutoDetectParser doesn't break on it - input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL.xlsb"); - - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL.xlsb")) { ContentHandler handler = new BodyContentHandler(-1); ParseContext context = new ParseContext(); context.set(Locale.class, Locale.US); @@ -325,8 +299,6 @@ public class ExcelParserTest { String content = handler.toString(); assertEquals("", content); - } finally { - input.close(); } } @@ -337,30 +309,23 @@ public class ExcelParserTest { public void testExcel95() throws Exception { Detector detector = new DefaultDetector(); AutoDetectParser parser = new AutoDetectParser(); - InputStream input; MediaType type; Metadata m; // First try detection of Excel 5 m = new Metadata(); m.add(Metadata.RESOURCE_NAME_KEY, "excel_5.xls"); - input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_5.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_5.xls")) { type = detector.detect(input, m); assertEquals("application/vnd.ms-excel", type.toString()); - } finally { - input.close(); } // Now Excel 95 m = new Metadata(); m.add(Metadata.RESOURCE_NAME_KEY, "excel_95.xls"); - input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_95.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_95.xls")) { type = detector.detect(input, m); assertEquals("application/vnd.ms-excel", type.toString()); - } finally { - input.close(); } // OfficeParser can handle it @@ -372,8 +337,7 @@ public class ExcelParserTest { // Parse the Excel 5 file m = new Metadata(); - input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_5.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_5.xls")) { ContentHandler handler = new BodyContentHandler(-1); ParseContext context = new ParseContext(); context.set(Locale.class, Locale.US); @@ -396,14 +360,11 @@ public class ExcelParserTest { // Metadata was also fetched assertEquals("Simple Excel document", m.get(TikaCoreProperties.TITLE)); assertEquals("Keith Bennett", m.get(TikaCoreProperties.CREATOR)); - } finally { - input.close(); } // Parse the Excel 95 file m = new Metadata(); - input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_95.xls"); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_95.xls")) { ContentHandler handler = new BodyContentHandler(-1); ParseContext context = new ParseContext(); context.set(Locale.class, Locale.US); @@ -419,8 +380,6 @@ public class ExcelParserTest { // Metadata was also fetched assertEquals(null, m.get(TikaCoreProperties.TITLE)); assertEquals("Marco Quaranta", m.get(Office.LAST_AUTHOR)); - } finally { - input.close(); } } @@ -429,17 +388,14 @@ public class ExcelParserTest { */ @Test public void testCustomProperties() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL_custom_props.xls"); Metadata metadata = new Metadata(); - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL_custom_props.xls")) { ContentHandler handler = new BodyContentHandler(-1); ParseContext context = new ParseContext(); context.set(Locale.class, Locale.US); new OfficeParser().parse(input, handler, metadata, context); - } finally { - input.close(); } assertEquals("application/vnd.ms-excel", metadata.get(Metadata.CONTENT_TYPE)); @@ -457,10 +413,8 @@ public class ExcelParserTest { @Test public void testHeaderAndFooterExtraction() throws Exception { - InputStream input = ExcelParserTest.class.getResourceAsStream( - "/test-documents/testEXCEL_headers_footers.xls"); - - try { + try (InputStream input = ExcelParserTest.class.getResourceAsStream( + "/test-documents/testEXCEL_headers_footers.xls")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); ParseContext context = new ParseContext(); @@ -484,8 +438,6 @@ public class ExcelParserTest { assertContains("Footer - Corporate Spreadsheet", content); assertContains("Footer - For Internal Use Only", content); assertContains("Footer - Author: John Smith", content); - } finally { - input.close(); } } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java Mon Aug 31 04:21:04 2015 @@ -40,14 +40,11 @@ public class OldExcelParserTest extends @Test public void testDetection() throws Exception { - TikaInputStream stream = getTestFile(file); Detector detector = new DefaultDetector(); - try { + try (TikaInputStream stream = getTestFile(file)) { assertEquals( MediaType.application("vnd.ms-excel.sheet.4"), detector.detect(stream, new Metadata())); - } finally { - stream.close(); } } @@ -79,11 +76,8 @@ public class OldExcelParserTest extends ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - TikaInputStream stream = getTestFile(file); - try { + try (TikaInputStream stream = getTestFile(file)) { new OldExcelParser().parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } String text = handler.toString(); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java Mon Aug 31 04:21:04 2015 @@ -50,12 +50,9 @@ public class OutlookParserTest extends T ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = OutlookParserTest.class.getResourceAsStream( - "/test-documents/test-outlook.msg"); - try { + try (InputStream stream = OutlookParserTest.class.getResourceAsStream( + "/test-documents/test-outlook.msg")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } assertEquals( @@ -97,12 +94,9 @@ public class OutlookParserTest extends T ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = OutlookParserTest.class.getResourceAsStream( - "/test-documents/testMSG.msg"); - try { + try (InputStream stream = OutlookParserTest.class.getResourceAsStream( + "/test-documents/testMSG.msg")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } assertEquals( @@ -127,12 +121,9 @@ public class OutlookParserTest extends T ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = OutlookParserTest.class.getResourceAsStream( - "/test-documents/test-outlook2003.msg"); - try { + try (InputStream stream = OutlookParserTest.class.getResourceAsStream( + "/test-documents/test-outlook2003.msg")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } assertEquals( @@ -162,12 +153,9 @@ public class OutlookParserTest extends T handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes"); handler.setResult(new StreamResult(sw)); - InputStream stream = OutlookParserTest.class.getResourceAsStream( - "/test-documents/testMSG_chinese.msg"); - try { + try (InputStream stream = OutlookParserTest.class.getResourceAsStream( + "/test-documents/testMSG_chinese.msg")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } // As the HTML version should have been processed, ensure @@ -201,12 +189,9 @@ public class OutlookParserTest extends T handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes"); handler.setResult(new StreamResult(sw)); - InputStream stream = OutlookParserTest.class.getResourceAsStream( - "/test-documents/testMSG_forwarded.msg"); - try { + try (InputStream stream = OutlookParserTest.class.getResourceAsStream( + "/test-documents/testMSG_forwarded.msg")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } // Make sure we don't have nested docs @@ -229,12 +214,9 @@ public class OutlookParserTest extends T handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes"); handler.setResult(new StreamResult(sw)); - InputStream stream = OutlookParserTest.class.getResourceAsStream( - "/test-documents/test-outlook2003.msg"); - try { + try (InputStream stream = OutlookParserTest.class.getResourceAsStream( + "/test-documents/test-outlook2003.msg")) { parser.parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } // As the HTML version should have been processed, ensure Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java Mon Aug 31 04:21:04 2015 @@ -35,9 +35,8 @@ public class PowerPointParserTest extend @Test public void testPowerPointParser() throws Exception { - InputStream input = PowerPointParserTest.class.getResourceAsStream( - "/test-documents/testPPT.ppt"); - try { + try (InputStream input = PowerPointParserTest.class.getResourceAsStream( + "/test-documents/testPPT.ppt")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); new OfficeParser().parse(input, handler, metadata, new ParseContext()); @@ -51,8 +50,6 @@ public class PowerPointParserTest extend String content = handler.toString(); assertContains("Sample Powerpoint Slide", content); assertContains("Powerpoint X for Mac", content); - } finally { - input.close(); } } @@ -61,12 +58,9 @@ public class PowerPointParserTest extend ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = PowerPointParserTest.class.getResourceAsStream( - "/test-documents/testPPT_various.ppt"); - try { + try (InputStream stream = PowerPointParserTest.class.getResourceAsStream( + "/test-documents/testPPT_various.ppt")) { new OfficeParser().parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } String content = handler.toString(); @@ -134,12 +128,9 @@ public class PowerPointParserTest extend ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = PowerPointParserTest.class.getResourceAsStream( - "/test-documents/testPPT_masterFooter.ppt"); - try { + try (InputStream stream = PowerPointParserTest.class.getResourceAsStream( + "/test-documents/testPPT_masterFooter.ppt")) { new OfficeParser().parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } String content = handler.toString(); @@ -161,12 +152,9 @@ public class PowerPointParserTest extend ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = PowerPointParserTest.class.getResourceAsStream( - "/test-documents/testPPT_masterText.ppt"); - try { + try (InputStream stream = PowerPointParserTest.class.getResourceAsStream( + "/test-documents/testPPT_masterText.ppt")) { new OfficeParser().parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } String content = handler.toString(); @@ -184,12 +172,9 @@ public class PowerPointParserTest extend ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); - InputStream stream = PowerPointParserTest.class.getResourceAsStream( - "/test-documents/testPPT_masterText2.ppt"); - try { + try (InputStream stream = PowerPointParserTest.class.getResourceAsStream( + "/test-documents/testPPT_masterText2.ppt")) { new OfficeParser().parse(stream, handler, metadata, new ParseContext()); - } finally { - stream.close(); } String content = handler.toString(); @@ -206,17 +191,14 @@ public class PowerPointParserTest extend */ @Test public void testCustomProperties() throws Exception { - InputStream input = PowerPointParserTest.class.getResourceAsStream( - "/test-documents/testPPT_custom_props.ppt"); Metadata metadata = new Metadata(); - try { + try (InputStream input = PowerPointParserTest.class.getResourceAsStream( + "/test-documents/testPPT_custom_props.ppt")) { ContentHandler handler = new BodyContentHandler(-1); ParseContext context = new ParseContext(); context.set(Locale.class, Locale.US); new OfficeParser().parse(input, handler, metadata, context); - } finally { - input.close(); } assertEquals("application/vnd.ms-powerpoint", metadata.get(Metadata.CONTENT_TYPE)); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java Mon Aug 31 04:21:04 2015 @@ -39,23 +39,17 @@ public class ProjectParserTest { @Test public void testProject2003() throws Exception { - InputStream input = ProjectParserTest.class.getResourceAsStream( - "/test-documents/testPROJECT2003.mpp"); - try { + try (InputStream input = ProjectParserTest.class.getResourceAsStream( + "/test-documents/testPROJECT2003.mpp")) { doTestProject(input); - } finally { - input.close(); } } @Test public void testProject2007() throws Exception { - InputStream input = ProjectParserTest.class.getResourceAsStream( - "/test-documents/testPROJECT2007.mpp"); - try { + try (InputStream input = ProjectParserTest.class.getResourceAsStream( + "/test-documents/testPROJECT2007.mpp")) { doTestProject(input); - } finally { - input.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java Mon Aug 31 04:21:04 2015 @@ -32,9 +32,8 @@ public class PublisherParserTest { @Test public void testPublisherParser() throws Exception { - InputStream input = PublisherParserTest.class.getResourceAsStream( - "/test-documents/testPUBLISHER.pub"); - try { + try (InputStream input = PublisherParserTest.class.getResourceAsStream( + "/test-documents/testPUBLISHER.pub")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); new OfficeParser().parse(input, handler, metadata, new ParseContext()); @@ -48,8 +47,6 @@ public class PublisherParserTest { String content = handler.toString(); assertContains("0123456789", content); assertContains("abcdef", content); - } finally { - input.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java Mon Aug 31 04:21:04 2015 @@ -40,14 +40,11 @@ public class TNEFParserTest extends Abst @Test public void testBasics() throws Exception { - TikaInputStream stream = getTestFile(file); Detector detector = new DefaultDetector(); - try { + try (TikaInputStream stream = getTestFile(file)) { assertEquals( MediaType.application("vnd.ms-tnef"), detector.detect(stream, new Metadata())); - } finally { - stream.close(); } } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java Mon Aug 31 04:21:04 2015 @@ -32,9 +32,8 @@ public class VisioParserTest { @Test public void testVisioParser() throws Exception { - InputStream input = VisioParserTest.class.getResourceAsStream( - "/test-documents/testVISIO.vsd"); - try { + try (InputStream input = VisioParserTest.class.getResourceAsStream( + "/test-documents/testVISIO.vsd")) { Metadata metadata = new Metadata(); ContentHandler handler = new BodyContentHandler(); new OfficeParser().parse(input, handler, metadata, new ParseContext()); @@ -46,8 +45,6 @@ public class VisioParserTest { assertEquals("Hogwarts", metadata.get(TikaCoreProperties.CREATOR)); String content = handler.toString(); assertContains("Some random text, on a page", content); - } finally { - input.close(); } }
