You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2015/08/31 06:21:05 UTC
svn commit: r1700195 [3/4] - in /tika/trunk:
tika-app/src/main/java/org/apache/tika/cli/
tika-app/src/main/java/org/apache/tika/gui/
tika-bundle/src/test/java/org/apache/tika/bundle/
tika-core/src/main/java/org/apache/tika/ tika-core/src/main/java/org/...
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java Mon Aug 31 04:21:04 2015
@@ -41,9 +41,8 @@ public class WordParserTest extends Tika
@Test
public void testWordParser() throws Exception {
- InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD.doc");
- try {
+ try (InputStream input = WordParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD.doc")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
@@ -55,23 +54,18 @@ public class WordParserTest extends Tika
assertEquals("Keith Bennett", metadata.get(TikaCoreProperties.CREATOR));
assertEquals("Keith Bennett", metadata.get(Metadata.AUTHOR));
assertContains("Sample Word Document", handler.toString());
- } finally {
- input.close();
}
}
@Test
public void testWordWithWAV() throws Exception {
- InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/Doc1_ole.doc");
- try {
+ try (InputStream input = WordParserTest.class.getResourceAsStream(
+ "/test-documents/Doc1_ole.doc")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
assertContains("MSj00974840000[1].wav", handler.toString());
- } finally {
- input.close();
}
}
@@ -178,9 +172,8 @@ public class WordParserTest extends Tika
@Test
public void testWord6Parser() throws Exception {
- InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD6.doc");
- try {
+ try (InputStream input = WordParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD6.doc")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
@@ -194,8 +187,6 @@ public class WordParserTest extends Tika
assertEquals("Nevin Nollop", metadata.get(TikaCoreProperties.CREATOR));
assertEquals("Nevin Nollop", metadata.get(Metadata.AUTHOR));
assertContains("The quick brown fox jumps over the lazy dog", handler.toString());
- } finally {
- input.close();
}
}
@@ -204,12 +195,9 @@ public class WordParserTest extends Tika
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_various.doc");
- try {
+ try (InputStream stream = WordParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD_various.doc")) {
new OfficeParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -280,12 +268,9 @@ public class WordParserTest extends Tika
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_no_format.doc");
- try {
+ try (InputStream stream = WordParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD_no_format.doc")) {
new OfficeParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -297,17 +282,14 @@ public class WordParserTest extends Tika
*/
@Test
public void testCustomProperties() throws Exception {
- InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_custom_props.doc");
Metadata metadata = new Metadata();
- try {
+ try (InputStream input = WordParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD_custom_props.doc")) {
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/msword", metadata.get(Metadata.CONTENT_TYPE));
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java Mon Aug 31 04:21:04 2015
@@ -67,8 +67,7 @@ public class OOXMLParserTest extends Tik
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
- InputStream input = getTestDocument("testEXCEL.xlsx");
- try {
+ try (InputStream input = getTestDocument("testEXCEL.xlsx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
@@ -86,8 +85,6 @@ public class OOXMLParserTest extends Tik
assertContains("196", content);
assertNotContained("196.0", content);
assertEquals("false", metadata.get(TikaMetadataKeys.PROTECTED));
- } finally {
- input.close();
}
}
@@ -98,8 +95,7 @@ public class OOXMLParserTest extends Tik
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
- InputStream input = getTestDocument("testEXCEL-formats.xlsx");
- try {
+ try (InputStream input = getTestDocument("testEXCEL-formats.xlsx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
@@ -161,8 +157,6 @@ public class OOXMLParserTest extends Tik
// Custom Number ("At" h:mm AM/PM "on" dddd mmmm d"," yyyy)
assertContains("At 4:20 AM on Thursday May 17, 2007", content);
**************************************************************************/
- } finally {
- input.close();
}
}
@@ -174,8 +168,7 @@ public class OOXMLParserTest extends Tik
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
- InputStream input = getTestDocument("testEXCEL.strict.xlsx");
- try {
+ try (InputStream input = getTestDocument("testEXCEL.strict.xlsx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
@@ -193,8 +186,6 @@ public class OOXMLParserTest extends Tik
assertContains("cb=sum", content);
assertNotContained("13.0", content);
assertEquals("false", metadata.get(TikaMetadataKeys.PROTECTED));
- } finally {
- input.close();
}
}
@@ -227,8 +218,7 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- InputStream input = getTestDocument(filename);
- try {
+ try (InputStream input = getTestDocument(filename)) {
parser.parse(input, handler, metadata, context);
assertEquals(
@@ -265,8 +255,6 @@ public class OOXMLParserTest extends Tik
content.contains("Mystery")
);
}
- } finally {
- input.close();
}
}
}
@@ -315,11 +303,8 @@ public class OOXMLParserTest extends Tik
};
ParseContext context = new ParseContext();
- InputStream input = getTestDocument(filename);
- try {
+ try (InputStream input = getTestDocument(filename)) {
parser.parse(input, handler, metadata, context);
- } finally {
- input.close();
}
}
}
@@ -346,8 +331,7 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- InputStream input = getTestDocument(filename);
- try {
+ try (InputStream input = getTestDocument(filename)) {
parser.parse(input, handler, metadata, context);
// Should get the metadata
@@ -357,8 +341,6 @@ public class OOXMLParserTest extends Tik
metadata.get(Metadata.CONTENT_TYPE));
// But that's about it
- } finally {
- input.close();
}
}
}
@@ -374,8 +356,7 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- InputStream input = getTestDocument("testWORD.docx");
- try {
+ try (InputStream input = getTestDocument("testWORD.docx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
@@ -384,8 +365,6 @@ public class OOXMLParserTest extends Tik
assertEquals("Keith Bennett", metadata.get(TikaCoreProperties.CREATOR));
assertEquals("Keith Bennett", metadata.get(Metadata.AUTHOR));
assertTrue(handler.toString().contains("Sample Word Document"));
- } finally {
- input.close();
}
}
@@ -400,15 +379,12 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- InputStream input = getTestDocument("footnotes.docx");
- try {
+ try (InputStream input = getTestDocument("footnotes.docx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
metadata.get(Metadata.CONTENT_TYPE));
assertTrue(handler.toString().contains("snoska"));
- } finally {
- input.close();
}
}
@@ -496,8 +472,7 @@ public class OOXMLParserTest extends Tik
handler.setResult(new StreamResult(sw));
// Try with a document containing various tables and formattings
- InputStream input = getTestDocument("headerPic.docx");
- try {
+ try (InputStream input = getTestDocument("headerPic.docx")) {
parser.parse(input, handler, metadata, context);
String xml = sw.toString();
assertEquals(
@@ -505,8 +480,6 @@ public class OOXMLParserTest extends Tik
metadata.get(Metadata.CONTENT_TYPE));
// Check that custom headings came through
assertTrue(xml.contains("<img"));
- } finally {
- input.close();
}
}
@@ -516,15 +489,14 @@ public class OOXMLParserTest extends Tik
*/
@Test
public void testProtectedExcelSheets() throws Exception {
- InputStream input = OOXMLParserTest.class
- .getResourceAsStream("/test-documents/protectedSheets.xlsx");
Parser parser = new AutoDetectParser();
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- try {
+ try (InputStream input = OOXMLParserTest.class
+ .getResourceAsStream("/test-documents/protectedSheets.xlsx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
@@ -532,8 +504,6 @@ public class OOXMLParserTest extends Tik
metadata.get(Metadata.CONTENT_TYPE));
assertEquals("true", metadata.get(TikaMetadataKeys.PROTECTED));
- } finally {
- input.close();
}
}
@@ -549,8 +519,7 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- InputStream input = getTestDocument("protectedFile.xlsx");
- try {
+ try (InputStream input = getTestDocument("protectedFile.xlsx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
@@ -561,8 +530,6 @@ public class OOXMLParserTest extends Tik
String content = handler.toString();
assertContains("Office", content);
- } finally {
- input.close();
}
}
@@ -577,12 +544,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- InputStream input = getTestDocument("NullHeader.docx");
- try {
+ try (InputStream input = getTestDocument("NullHeader.docx")) {
parser.parse(input, handler, metadata, context);
assertEquals("Should have found some text", false, handler.toString().isEmpty());
- } finally {
- input.close();
}
}
@@ -591,12 +555,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_various.docx");
- try {
+ try (InputStream stream = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD_various.docx")) {
new AutoDetectParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -663,12 +624,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_various.pptx");
- try {
+ try (InputStream stream = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testPPT_various.pptx")) {
new AutoDetectParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -735,12 +693,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_masterFooter.pptx");
- try {
+ try (InputStream stream = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testPPT_masterFooter.pptx")) {
new AutoDetectParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -756,12 +711,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_masterText.pptx");
- try {
+ try (InputStream stream = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testPPT_masterText.pptx")) {
new AutoDetectParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -773,12 +725,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_masterText2.pptx");
- try {
+ try (InputStream stream = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testPPT_masterText2.pptx")) {
new AutoDetectParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -790,12 +739,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testWordArt.pptx");
- try {
+ try (InputStream stream = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testWordArt.pptx")) {
new AutoDetectParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
assertContains("Here is some red word Art", content);
@@ -806,17 +752,14 @@ public class OOXMLParserTest extends Tik
*/
@Test
public void testExcelCustomProperties() throws Exception {
- InputStream input = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL_custom_props.xlsx");
Metadata metadata = new Metadata();
- try {
+ try (InputStream input = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testEXCEL_custom_props.xlsx")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
new OOXMLParser().parse(input, handler, metadata, context);
- } finally {
- input.close();
}
assertEquals(
@@ -840,17 +783,14 @@ public class OOXMLParserTest extends Tik
@Test
public void testWordCustomProperties() throws Exception {
- InputStream input = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_custom_props.docx");
Metadata metadata = new Metadata();
- try {
+ try (InputStream input = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD_custom_props.docx")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
new OOXMLParser().parse(input, handler, metadata, context);
- } finally {
- input.close();
}
assertEquals(
@@ -884,17 +824,14 @@ public class OOXMLParserTest extends Tik
@Test
public void testPowerPointCustomProperties() throws Exception {
- InputStream input = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_custom_props.pptx");
Metadata metadata = new Metadata();
- try {
+ try (InputStream input = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testPPT_custom_props.pptx")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
new OOXMLParser().parse(input, handler, metadata, context);
- } finally {
- input.close();
}
assertEquals(
@@ -920,8 +857,6 @@ public class OOXMLParserTest extends Tik
// TIKA-989:
@Test
public void testEmbeddedPDF() throws Exception {
- InputStream input = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_embedded_pdf.docx");
Metadata metadata = new Metadata();
StringWriter sw = new StringWriter();
SAXTransformerFactory factory = (SAXTransformerFactory)
@@ -931,10 +866,9 @@ public class OOXMLParserTest extends Tik
handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "no");
handler.setResult(new StreamResult(sw));
- try {
+ try (InputStream input = OOXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD_embedded_pdf.docx")) {
new OOXMLParser().parse(input, handler, metadata, new ParseContext());
- } finally {
- input.close();
}
String xml = sw.toString();
int i = xml.indexOf("Here is the pdf file:");
@@ -986,12 +920,9 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_no_format.docx");
- try {
+ try (InputStream stream = WordParserTest.class.getResourceAsStream(
+ "/test-documents/testWORD_no_format.docx")) {
new OOXMLParser().parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
String content = handler.toString();
@@ -1027,8 +958,7 @@ public class OOXMLParserTest extends Tik
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
- InputStream input = getTestDocument("testWORD_missing_text.docx");
- try {
+ try (InputStream input = getTestDocument("testWORD_missing_text.docx")) {
parser.parse(input, handler, metadata, context);
assertEquals(
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
@@ -1036,8 +966,6 @@ public class OOXMLParserTest extends Tik
assertContains("BigCompany", handler.toString());
assertContains("Seasoned", handler.toString());
assertContains("Rich_text_in_cell", handler.toString());
- } finally {
- input.close();
}
}
@@ -1148,30 +1076,22 @@ public class OOXMLParserTest extends Tik
passwordContext.set(org.apache.tika.parser.PasswordProvider.class, passwordProvider);
for (Map.Entry<String, String> e : tests.entrySet()) {
- InputStream is = null;
- try {
- is = getTestDocument(e.getKey());
+ try (InputStream is = getTestDocument(e.getKey())) {
ContentHandler handler = new BodyContentHandler();
parser.parse(is, handler, m, passwordContext);
assertContains(e.getValue(), handler.toString());
- } finally {
- is.close();
}
}
ParseContext context = new ParseContext();
//now try with no password
for (Map.Entry<String, String> e : tests.entrySet()) {
- InputStream is = null;
boolean exc = false;
- try {
- is = getTestDocument(e.getKey());
+ try (InputStream is = getTestDocument(e.getKey())) {
ContentHandler handler = new BodyContentHandler();
parser.parse(is, handler, m, context);
} catch (EncryptedDocumentException ex) {
exc = true;
- } finally {
- is.close();
}
assertTrue(exc);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java Mon Aug 31 04:21:04 2015
@@ -56,12 +56,9 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3id3v1.mp3");
- try {
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3id3v1.mp3")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
@@ -93,12 +90,9 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3id3v2.mp3");
- try {
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3id3v2.mp3")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
// Check core properties
@@ -151,12 +145,9 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3id3v1_v2.mp3");
- try {
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3id3v1_v2.mp3")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
@@ -188,12 +179,9 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3id3v24.mp3");
- try {
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3id3v24.mp3")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
@@ -238,13 +226,10 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3i18n.mp3");
- try {
- parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
- }
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3i18n.mp3")) {
+ parser.parse(stream, handler, metadata, new ParseContext());
+ }
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("Une chason en Fran\u00e7ais", metadata.get(TikaCoreProperties.TITLE));
@@ -278,13 +263,10 @@ public class Mp3ParserTest {
// Note - our test file has a lyrics tag, but lacks any
// lyrics in the tags, so we can't test that bit
// TODO Find a better sample file
-
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3lyrics.mp3");
- try {
+
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3lyrics.mp3")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
@@ -335,12 +317,9 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3noid3.mp3");
- try {
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3noid3.mp3")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
assertEquals("2455.510986328125", metadata.get(XMPDM.DURATION));
@@ -359,19 +338,15 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/test2.mp3");
- if(stream == null) {
- // You haven't downloaded the file
- // Skip the test
- return;
- }
-
- try {
- parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
- }
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/test2.mp3")) {
+ if (stream == null) {
+ // You haven't downloaded the file
+ // Skip the test
+ return;
+ }
+ parser.parse(stream, handler, metadata, new ParseContext());
+ }
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("Plus loin vers l'ouest", metadata.get(TikaCoreProperties.TITLE));
@@ -399,15 +374,10 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testMP3truncated.mp3");
-
-
- try {
- parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
- }
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP3truncated.mp3")) {
+ parser.parse(stream, handler, metadata, new ParseContext());
+ }
// Check we could get the headers from the start
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
@@ -434,14 +404,10 @@ public class Mp3ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Mp3ParserTest.class.getResourceAsStream(
- "/test-documents/testNakedUTF16BOM.mp3");
-
- try {
- parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
- }
+ try (InputStream stream = Mp3ParserTest.class.getResourceAsStream(
+ "/test-documents/testNakedUTF16BOM.mp3")) {
+ parser.parse(stream, handler, metadata, new ParseContext());
+ }
assertEquals("audio/mpeg", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("", metadata.get(XMPDM.GENRE));
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java Mon Aug 31 04:21:04 2015
@@ -47,12 +47,9 @@ public class MP4ParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = MP4ParserTest.class.getResourceAsStream(
- "/test-documents/testMP4.m4a");
- try {
+ try (InputStream stream = MP4ParserTest.class.getResourceAsStream(
+ "/test-documents/testMP4.m4a")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
// Check core properties
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java Mon Aug 31 04:21:04 2015
@@ -42,12 +42,9 @@ public class NetCDFParserTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = NetCDFParser.class
- .getResourceAsStream("/test-documents/sresa1b_ncar_ccsm3_0_run1_200001.nc");
- try {
+ try (InputStream stream = NetCDFParser.class
+ .getResourceAsStream("/test-documents/sresa1b_ncar_ccsm3_0_run1_200001.nc")) {
parser.parse(stream, handler, metadata, new ParseContext());
- } finally {
- stream.close();
}
assertEquals(metadata.get(TikaCoreProperties.TITLE),
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java Mon Aug 31 04:21:04 2015
@@ -138,12 +138,8 @@ public class TesseractOCRParserTest exte
parseContext.set(Parser.class, parser);
parseContext.set(PDFParserConfig.class, pdfConfig);
- InputStream stream = TesseractOCRParserTest.class.getResourceAsStream(resource);
-
- try {
+ try (InputStream stream = TesseractOCRParserTest.class.getResourceAsStream(resource)) {
parser.parse(stream, new DefaultHandler(), new Metadata(), parseContext);
- } finally {
- stream.close();
}
List<Metadata> metadataList = ((RecursiveParserWrapper) parser).getMetadata();
assertEquals(numMetadatas, metadataList.size());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java Mon Aug 31 04:21:04 2015
@@ -50,95 +50,89 @@ public class ODFParserTest extends TikaT
@Test
public void testOO3() throws Exception {
for (Parser parser : getParsers()) {
- InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testODFwithOOo3.odt");
- try {
- Metadata metadata = new Metadata();
- ContentHandler handler = new BodyContentHandler();
- parser.parse(input, handler, metadata, new ParseContext());
-
- assertEquals(
- "application/vnd.oasis.opendocument.text",
- metadata.get(Metadata.CONTENT_TYPE));
-
- String content = handler.toString();
- assertContains("Tika is part of the Lucene project.", content);
- assertContains("Solr", content);
- assertContains("one embedded", content);
- assertContains("Rectangle Title", content);
- assertContains("a blue background and dark border", content);
- } finally {
- input.close();
- }
+ try (InputStream input = ODFParserTest.class.getResourceAsStream(
+ "/test-documents/testODFwithOOo3.odt")) {
+ Metadata metadata = new Metadata();
+ ContentHandler handler = new BodyContentHandler();
+ parser.parse(input, handler, metadata, new ParseContext());
+
+ assertEquals(
+ "application/vnd.oasis.opendocument.text",
+ metadata.get(Metadata.CONTENT_TYPE));
+
+ String content = handler.toString();
+ assertContains("Tika is part of the Lucene project.", content);
+ assertContains("Solr", content);
+ assertContains("one embedded", content);
+ assertContains("Rectangle Title", content);
+ assertContains("a blue background and dark border", content);
+ }
}
}
@Test
public void testOO2() throws Exception {
for (Parser parser : getParsers()) {
- InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testOpenOffice2.odt");
- try {
- Metadata metadata = new Metadata();
- ContentHandler handler = new BodyContentHandler();
- parser.parse(input, handler, metadata, new ParseContext());
-
- assertEquals(
- "application/vnd.oasis.opendocument.text",
- metadata.get(Metadata.CONTENT_TYPE));
- assertEquals("en-US", metadata.get(Metadata.LANGUAGE));
- assertEquals("PT1M7S", metadata.get(Metadata.EDIT_TIME));
- assertEquals(
- "NeoOffice/2.2$Unix OpenOffice.org_project/680m18$Build-9161",
- metadata.get("generator"));
-
- // Check date metadata, both old-style and new-style
- assertEquals("2007-09-14T11:07:10", metadata.get(TikaCoreProperties.MODIFIED));
- assertEquals("2007-09-14T11:07:10", metadata.get(Metadata.MODIFIED));
- assertEquals("2007-09-14T11:07:10", metadata.get(Metadata.DATE));
- assertEquals("2007-09-14T11:06:08", metadata.get(TikaCoreProperties.CREATED));
- assertEquals("2007-09-14T11:06:08", metadata.get(Metadata.CREATION_DATE));
-
- // Check the document statistics
- assertEquals("1", metadata.get(Office.PAGE_COUNT));
- assertEquals("1", metadata.get(Office.PARAGRAPH_COUNT));
- assertEquals("14", metadata.get(Office.WORD_COUNT));
- assertEquals("78", metadata.get(Office.CHARACTER_COUNT));
- assertEquals("0", metadata.get(Office.TABLE_COUNT));
- assertEquals("0", metadata.get(Office.OBJECT_COUNT));
- assertEquals("0", metadata.get(Office.IMAGE_COUNT));
-
- // Check the Tika-1.0 style document statistics
- assertEquals("1", metadata.get(Metadata.PAGE_COUNT));
- assertEquals("1", metadata.get(Metadata.PARAGRAPH_COUNT));
- assertEquals("14", metadata.get(Metadata.WORD_COUNT));
- assertEquals("78", metadata.get(Metadata.CHARACTER_COUNT));
- assertEquals("0", metadata.get(Metadata.TABLE_COUNT));
- assertEquals("0", metadata.get(Metadata.OBJECT_COUNT));
- assertEquals("0", metadata.get(Metadata.IMAGE_COUNT));
-
- // Check the very old style statistics (these will be removed shortly)
- assertEquals("0", metadata.get("nbTab"));
- assertEquals("0", metadata.get("nbObject"));
- assertEquals("0", metadata.get("nbImg"));
- assertEquals("1", metadata.get("nbPage"));
- assertEquals("1", metadata.get("nbPara"));
- assertEquals("14", metadata.get("nbWord"));
- assertEquals("78", metadata.get("nbCharacter"));
-
- // Custom metadata tags present but without values
- assertEquals(null, metadata.get("custom:Info 1"));
- assertEquals(null, metadata.get("custom:Info 2"));
- assertEquals(null, metadata.get("custom:Info 3"));
- assertEquals(null, metadata.get("custom:Info 4"));
-
- String content = handler.toString();
- assertTrue(content.contains(
- "This is a sample Open Office document,"
- + " written in NeoOffice 2.2.1 for the Mac."));
- } finally {
- input.close();
- }
+ try (InputStream input = ODFParserTest.class.getResourceAsStream(
+ "/test-documents/testOpenOffice2.odt")) {
+ Metadata metadata = new Metadata();
+ ContentHandler handler = new BodyContentHandler();
+ parser.parse(input, handler, metadata, new ParseContext());
+
+ assertEquals(
+ "application/vnd.oasis.opendocument.text",
+ metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals("en-US", metadata.get(Metadata.LANGUAGE));
+ assertEquals("PT1M7S", metadata.get(Metadata.EDIT_TIME));
+ assertEquals(
+ "NeoOffice/2.2$Unix OpenOffice.org_project/680m18$Build-9161",
+ metadata.get("generator"));
+
+ // Check date metadata, both old-style and new-style
+ assertEquals("2007-09-14T11:07:10", metadata.get(TikaCoreProperties.MODIFIED));
+ assertEquals("2007-09-14T11:07:10", metadata.get(Metadata.MODIFIED));
+ assertEquals("2007-09-14T11:07:10", metadata.get(Metadata.DATE));
+ assertEquals("2007-09-14T11:06:08", metadata.get(TikaCoreProperties.CREATED));
+ assertEquals("2007-09-14T11:06:08", metadata.get(Metadata.CREATION_DATE));
+
+ // Check the document statistics
+ assertEquals("1", metadata.get(Office.PAGE_COUNT));
+ assertEquals("1", metadata.get(Office.PARAGRAPH_COUNT));
+ assertEquals("14", metadata.get(Office.WORD_COUNT));
+ assertEquals("78", metadata.get(Office.CHARACTER_COUNT));
+ assertEquals("0", metadata.get(Office.TABLE_COUNT));
+ assertEquals("0", metadata.get(Office.OBJECT_COUNT));
+ assertEquals("0", metadata.get(Office.IMAGE_COUNT));
+
+ // Check the Tika-1.0 style document statistics
+ assertEquals("1", metadata.get(Metadata.PAGE_COUNT));
+ assertEquals("1", metadata.get(Metadata.PARAGRAPH_COUNT));
+ assertEquals("14", metadata.get(Metadata.WORD_COUNT));
+ assertEquals("78", metadata.get(Metadata.CHARACTER_COUNT));
+ assertEquals("0", metadata.get(Metadata.TABLE_COUNT));
+ assertEquals("0", metadata.get(Metadata.OBJECT_COUNT));
+ assertEquals("0", metadata.get(Metadata.IMAGE_COUNT));
+
+ // Check the very old style statistics (these will be removed shortly)
+ assertEquals("0", metadata.get("nbTab"));
+ assertEquals("0", metadata.get("nbObject"));
+ assertEquals("0", metadata.get("nbImg"));
+ assertEquals("1", metadata.get("nbPage"));
+ assertEquals("1", metadata.get("nbPara"));
+ assertEquals("14", metadata.get("nbWord"));
+ assertEquals("78", metadata.get("nbCharacter"));
+
+ // Custom metadata tags present but without values
+ assertEquals(null, metadata.get("custom:Info 1"));
+ assertEquals(null, metadata.get("custom:Info 2"));
+ assertEquals(null, metadata.get("custom:Info 3"));
+ assertEquals(null, metadata.get("custom:Info 4"));
+
+ String content = handler.toString();
+ assertTrue(content.contains(
+ "This is a sample Open Office document,"
+ + " written in NeoOffice 2.2.1 for the Mac."));
+ }
}
}
@@ -147,62 +141,59 @@ public class ODFParserTest extends TikaT
* OO2 file with different metadata in it
*/
@Test
- public void testOO2Metadata() throws Exception {
- InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testOpenOffice2.odf");
- try {
- Metadata metadata = new Metadata();
- ContentHandler handler = new BodyContentHandler();
- new OpenDocumentParser().parse(input, handler, metadata);
-
- assertEquals(
- "application/vnd.oasis.opendocument.formula",
- metadata.get(Metadata.CONTENT_TYPE));
- assertEquals(null, metadata.get(TikaCoreProperties.MODIFIED));
- assertEquals("2006-01-27T11:55:22", metadata.get(Metadata.CREATION_DATE));
- assertEquals("The quick brown fox jumps over the lazy dog",
- metadata.get(TikaCoreProperties.TITLE));
- assertEquals("Gym class featuring a brown fox and lazy dog",
- metadata.get(TikaCoreProperties.DESCRIPTION));
- assertEquals("Gym class featuring a brown fox and lazy dog",
- metadata.get(OfficeOpenXMLCore.SUBJECT));
- assertEquals("Gym class featuring a brown fox and lazy dog",
- metadata.get(Metadata.SUBJECT));
- assertEquals("PT0S", metadata.get(Metadata.EDIT_TIME));
- assertEquals("1", metadata.get("editing-cycles"));
- assertEquals(
- "OpenOffice.org/2.2$Win32 OpenOffice.org_project/680m14$Build-9134",
- metadata.get("generator"));
- assertEquals("Pangram, fox, dog", metadata.get(Metadata.KEYWORDS));
-
- // User defined metadata
- assertEquals("Text 1", metadata.get("custom:Info 1"));
- assertEquals("2", metadata.get("custom:Info 2"));
- assertEquals("false", metadata.get("custom:Info 3"));
- assertEquals("true", metadata.get("custom:Info 4"));
-
- // No statistics present
- assertEquals(null, metadata.get(Metadata.PAGE_COUNT));
- assertEquals(null, metadata.get(Metadata.PARAGRAPH_COUNT));
- assertEquals(null, metadata.get(Metadata.WORD_COUNT));
- assertEquals(null, metadata.get(Metadata.CHARACTER_COUNT));
- assertEquals(null, metadata.get(Metadata.TABLE_COUNT));
- assertEquals(null, metadata.get(Metadata.OBJECT_COUNT));
- assertEquals(null, metadata.get(Metadata.IMAGE_COUNT));
- assertEquals(null, metadata.get("nbTab"));
- assertEquals(null, metadata.get("nbObject"));
- assertEquals(null, metadata.get("nbImg"));
- assertEquals(null, metadata.get("nbPage"));
- assertEquals(null, metadata.get("nbPara"));
- assertEquals(null, metadata.get("nbWord"));
- assertEquals(null, metadata.get("nbCharacter"));
-
- // Note - contents of maths files not currently supported
- String content = handler.toString();
- assertEquals("", content);
- } finally {
- input.close();
- }
+ public void testOO2Metadata() throws Exception {
+ try (InputStream input = ODFParserTest.class.getResourceAsStream(
+ "/test-documents/testOpenOffice2.odf")) {
+ Metadata metadata = new Metadata();
+ ContentHandler handler = new BodyContentHandler();
+ new OpenDocumentParser().parse(input, handler, metadata);
+
+ assertEquals(
+ "application/vnd.oasis.opendocument.formula",
+ metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(null, metadata.get(TikaCoreProperties.MODIFIED));
+ assertEquals("2006-01-27T11:55:22", metadata.get(Metadata.CREATION_DATE));
+ assertEquals("The quick brown fox jumps over the lazy dog",
+ metadata.get(TikaCoreProperties.TITLE));
+ assertEquals("Gym class featuring a brown fox and lazy dog",
+ metadata.get(TikaCoreProperties.DESCRIPTION));
+ assertEquals("Gym class featuring a brown fox and lazy dog",
+ metadata.get(OfficeOpenXMLCore.SUBJECT));
+ assertEquals("Gym class featuring a brown fox and lazy dog",
+ metadata.get(Metadata.SUBJECT));
+ assertEquals("PT0S", metadata.get(Metadata.EDIT_TIME));
+ assertEquals("1", metadata.get("editing-cycles"));
+ assertEquals(
+ "OpenOffice.org/2.2$Win32 OpenOffice.org_project/680m14$Build-9134",
+ metadata.get("generator"));
+ assertEquals("Pangram, fox, dog", metadata.get(Metadata.KEYWORDS));
+
+ // User defined metadata
+ assertEquals("Text 1", metadata.get("custom:Info 1"));
+ assertEquals("2", metadata.get("custom:Info 2"));
+ assertEquals("false", metadata.get("custom:Info 3"));
+ assertEquals("true", metadata.get("custom:Info 4"));
+
+ // No statistics present
+ assertEquals(null, metadata.get(Metadata.PAGE_COUNT));
+ assertEquals(null, metadata.get(Metadata.PARAGRAPH_COUNT));
+ assertEquals(null, metadata.get(Metadata.WORD_COUNT));
+ assertEquals(null, metadata.get(Metadata.CHARACTER_COUNT));
+ assertEquals(null, metadata.get(Metadata.TABLE_COUNT));
+ assertEquals(null, metadata.get(Metadata.OBJECT_COUNT));
+ assertEquals(null, metadata.get(Metadata.IMAGE_COUNT));
+ assertEquals(null, metadata.get("nbTab"));
+ assertEquals(null, metadata.get("nbObject"));
+ assertEquals(null, metadata.get("nbImg"));
+ assertEquals(null, metadata.get("nbPage"));
+ assertEquals(null, metadata.get("nbPara"));
+ assertEquals(null, metadata.get("nbWord"));
+ assertEquals(null, metadata.get("nbCharacter"));
+
+ // Note - contents of maths files not currently supported
+ String content = handler.toString();
+ assertEquals("", content);
+ }
}
/**
@@ -210,167 +201,146 @@ public class ODFParserTest extends TikaT
*/
@Test
public void testOO3Metadata() throws Exception {
- InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testODFwithOOo3.odt");
- try {
- Metadata metadata = new Metadata();
- ContentHandler handler = new BodyContentHandler();
- new OpenDocumentParser().parse(input, handler, metadata);
-
- assertEquals(
- "application/vnd.oasis.opendocument.text",
- metadata.get(Metadata.CONTENT_TYPE));
- assertEquals("2009-10-05T21:22:38", metadata.get(TikaCoreProperties.MODIFIED));
- assertEquals("2009-10-05T19:04:01", metadata.get(TikaCoreProperties.CREATED));
- assertEquals("2009-10-05T19:04:01", metadata.get(Metadata.CREATION_DATE));
- assertEquals("Apache Tika", metadata.get(TikaCoreProperties.TITLE));
- assertEquals("Test document", metadata.get(OfficeOpenXMLCore.SUBJECT));
- assertEquals("Test document", metadata.get(Metadata.SUBJECT));
- assertEquals("A rather complex document", metadata.get(TikaCoreProperties.DESCRIPTION));
- assertEquals("Bart Hanssens", metadata.get(TikaCoreProperties.CREATOR));
- assertEquals("Bart Hanssens", metadata.get("initial-creator"));
- assertEquals("2", metadata.get("editing-cycles"));
- assertEquals("PT02H03M24S", metadata.get(Metadata.EDIT_TIME));
- assertEquals(
- "OpenOffice.org/3.1$Unix OpenOffice.org_project/310m19$Build-9420",
- metadata.get("generator"));
- assertEquals("Apache, Lucene, Tika", metadata.get(Metadata.KEYWORDS));
-
- // User defined metadata
- assertEquals("Bart Hanssens", metadata.get("custom:Editor"));
- assertEquals(null, metadata.get("custom:Info 2"));
- assertEquals(null, metadata.get("custom:Info 3"));
- assertEquals(null, metadata.get("custom:Info 4"));
-
- // Check the document statistics
- assertEquals("2", metadata.get(Office.PAGE_COUNT));
- assertEquals("13", metadata.get(Office.PARAGRAPH_COUNT));
- assertEquals("54", metadata.get(Office.WORD_COUNT));
- assertEquals("351", metadata.get(Office.CHARACTER_COUNT));
- assertEquals("0", metadata.get(Office.TABLE_COUNT));
- assertEquals("2", metadata.get(Office.OBJECT_COUNT));
- assertEquals("0", metadata.get(Office.IMAGE_COUNT));
-
- // Check the Tika-1.0 style document statistics
- assertEquals("2", metadata.get(Metadata.PAGE_COUNT));
- assertEquals("13", metadata.get(Metadata.PARAGRAPH_COUNT));
- assertEquals("54", metadata.get(Metadata.WORD_COUNT));
- assertEquals("351", metadata.get(Metadata.CHARACTER_COUNT));
- assertEquals("0", metadata.get(Metadata.TABLE_COUNT));
- assertEquals("2", metadata.get(Metadata.OBJECT_COUNT));
- assertEquals("0", metadata.get(Metadata.IMAGE_COUNT));
-
- // Check the old style statistics (these will be removed shortly)
- assertEquals("0", metadata.get("nbTab"));
- assertEquals("2", metadata.get("nbObject"));
- assertEquals("0", metadata.get("nbImg"));
- assertEquals("2", metadata.get("nbPage"));
- assertEquals("13", metadata.get("nbPara"));
- assertEquals("54", metadata.get("nbWord"));
- assertEquals("351", metadata.get("nbCharacter"));
-
- String content = handler.toString();
- assertTrue(content.contains(
- "Apache Tika Tika is part of the Lucene project."
- ));
- } finally {
- input.close();
- }
+ try (InputStream input = ODFParserTest.class.getResourceAsStream(
+ "/test-documents/testODFwithOOo3.odt")) {
+ Metadata metadata = new Metadata();
+ ContentHandler handler = new BodyContentHandler();
+ new OpenDocumentParser().parse(input, handler, metadata);
+
+ assertEquals(
+ "application/vnd.oasis.opendocument.text",
+ metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals("2009-10-05T21:22:38", metadata.get(TikaCoreProperties.MODIFIED));
+ assertEquals("2009-10-05T19:04:01", metadata.get(TikaCoreProperties.CREATED));
+ assertEquals("2009-10-05T19:04:01", metadata.get(Metadata.CREATION_DATE));
+ assertEquals("Apache Tika", metadata.get(TikaCoreProperties.TITLE));
+ assertEquals("Test document", metadata.get(OfficeOpenXMLCore.SUBJECT));
+ assertEquals("Test document", metadata.get(Metadata.SUBJECT));
+ assertEquals("A rather complex document", metadata.get(TikaCoreProperties.DESCRIPTION));
+ assertEquals("Bart Hanssens", metadata.get(TikaCoreProperties.CREATOR));
+ assertEquals("Bart Hanssens", metadata.get("initial-creator"));
+ assertEquals("2", metadata.get("editing-cycles"));
+ assertEquals("PT02H03M24S", metadata.get(Metadata.EDIT_TIME));
+ assertEquals(
+ "OpenOffice.org/3.1$Unix OpenOffice.org_project/310m19$Build-9420",
+ metadata.get("generator"));
+ assertEquals("Apache, Lucene, Tika", metadata.get(Metadata.KEYWORDS));
+
+ // User defined metadata
+ assertEquals("Bart Hanssens", metadata.get("custom:Editor"));
+ assertEquals(null, metadata.get("custom:Info 2"));
+ assertEquals(null, metadata.get("custom:Info 3"));
+ assertEquals(null, metadata.get("custom:Info 4"));
+
+ // Check the document statistics
+ assertEquals("2", metadata.get(Office.PAGE_COUNT));
+ assertEquals("13", metadata.get(Office.PARAGRAPH_COUNT));
+ assertEquals("54", metadata.get(Office.WORD_COUNT));
+ assertEquals("351", metadata.get(Office.CHARACTER_COUNT));
+ assertEquals("0", metadata.get(Office.TABLE_COUNT));
+ assertEquals("2", metadata.get(Office.OBJECT_COUNT));
+ assertEquals("0", metadata.get(Office.IMAGE_COUNT));
+
+ // Check the Tika-1.0 style document statistics
+ assertEquals("2", metadata.get(Metadata.PAGE_COUNT));
+ assertEquals("13", metadata.get(Metadata.PARAGRAPH_COUNT));
+ assertEquals("54", metadata.get(Metadata.WORD_COUNT));
+ assertEquals("351", metadata.get(Metadata.CHARACTER_COUNT));
+ assertEquals("0", metadata.get(Metadata.TABLE_COUNT));
+ assertEquals("2", metadata.get(Metadata.OBJECT_COUNT));
+ assertEquals("0", metadata.get(Metadata.IMAGE_COUNT));
+
+ // Check the old style statistics (these will be removed shortly)
+ assertEquals("0", metadata.get("nbTab"));
+ assertEquals("2", metadata.get("nbObject"));
+ assertEquals("0", metadata.get("nbImg"));
+ assertEquals("2", metadata.get("nbPage"));
+ assertEquals("13", metadata.get("nbPara"));
+ assertEquals("54", metadata.get("nbWord"));
+ assertEquals("351", metadata.get("nbCharacter"));
+
+ String content = handler.toString();
+ assertTrue(content.contains(
+ "Apache Tika Tika is part of the Lucene project."
+ ));
+ }
}
@Test
public void testODPMasterFooter() throws Exception {
- InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testMasterFooter.odp");
- try {
+ try (InputStream input = ODFParserTest.class.getResourceAsStream(
+ "/test-documents/testMasterFooter.odp")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new AutoDetectParser().parse(input, handler, metadata);
-
+
String content = handler.toString();
assertContains("Master footer is here", content);
- } finally {
- input.close();
}
}
@Test
public void testODTFooter() throws Exception {
- InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testFooter.odt");
- try {
+ try (InputStream input = ODFParserTest.class.getResourceAsStream(
+ "/test-documents/testFooter.odt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new AutoDetectParser().parse(input, handler, metadata);
-
+
String content = handler.toString();
assertContains("Here is some text...", content);
assertContains("Here is some text on page 2", content);
assertContains("Here is footer text", content);
- } finally {
- input.close();
}
}
@Test
public void testODSFooter() throws Exception {
- InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testFooter.ods");
- try {
+ try (InputStream input = ODFParserTest.class.getResourceAsStream(
+ "/test-documents/testFooter.ods")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new AutoDetectParser().parse(input, handler, metadata);
-
+
String content = handler.toString();
assertContains("Here is a footer in the center area", content);
- } finally {
- input.close();
}
}
@Test
public void testFromFile() throws Exception {
- TikaInputStream tis = TikaInputStream.get(this.getClass().getResource(
- "/test-documents/testODFwithOOo3.odt"));
- assertEquals(true, tis.hasFile());
-
- OpenDocumentParser parser = new OpenDocumentParser();
-
- try {
- Metadata metadata = new Metadata();
- ContentHandler handler = new BodyContentHandler();
- parser.parse(tis, handler, metadata, new ParseContext());
-
- assertEquals(
- "application/vnd.oasis.opendocument.text",
- metadata.get(Metadata.CONTENT_TYPE));
-
- String content = handler.toString();
- assertContains("Tika is part of the Lucene project.", content);
- } finally {
- tis.close();
- }
+ try (TikaInputStream tis = TikaInputStream.get(this.getClass().getResource(
+ "/test-documents/testODFwithOOo3.odt"))) {
+ assertEquals(true, tis.hasFile());
+ OpenDocumentParser parser = new OpenDocumentParser();
+ Metadata metadata = new Metadata();
+ ContentHandler handler = new BodyContentHandler();
+ parser.parse(tis, handler, metadata, new ParseContext());
+
+ assertEquals(
+ "application/vnd.oasis.opendocument.text",
+ metadata.get(Metadata.CONTENT_TYPE));
+
+ String content = handler.toString();
+ assertContains("Tika is part of the Lucene project.", content);
+ }
}
@Test
public void testNPEFromFile() throws Exception {
- TikaInputStream tis = TikaInputStream.get(this.getClass().getResource(
- "/test-documents/testNPEOpenDocument.odt"));
OpenDocumentParser parser = new OpenDocumentParser();
+ try (TikaInputStream tis = TikaInputStream.get(this.getClass().getResource(
+ "/test-documents/testNPEOpenDocument.odt"))) {
+ Metadata metadata = new Metadata();
+ ContentHandler handler = new BodyContentHandler();
+ parser.parse(tis, handler, metadata, new ParseContext());
+
+ assertEquals(
+ "application/vnd.oasis.opendocument.text",
+ metadata.get(Metadata.CONTENT_TYPE));
- try {
- Metadata metadata = new Metadata();
- ContentHandler handler = new BodyContentHandler();
- parser.parse(tis, handler, metadata, new ParseContext());
-
- assertEquals(
- "application/vnd.oasis.opendocument.text",
- metadata.get(Metadata.CONTENT_TYPE));
-
- String content = handler.toString();
- assertContains("primero hay que generar un par de claves", content);
- } finally {
- tis.close();
+ String content = handler.toString();
+ assertContains("primero hay que generar un par de claves", content);
}
}
@@ -390,8 +360,7 @@ public class ODFParserTest extends TikaT
@Test
public void testNullStylesInODTFooter() throws Exception {
Parser parser = new OpenDocumentParser();
- InputStream input = ODFParserTest.class.getResourceAsStream("/test-documents/testODT-TIKA-6000.odt");
- try {
+ try (InputStream input = ODFParserTest.class.getResourceAsStream("/test-documents/testODT-TIKA-6000.odt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
parser.parse(input, handler, metadata, new ParseContext());
@@ -404,8 +373,6 @@ public class ODFParserTest extends TikaT
assertContains("Copyright and License", content);
assertContains("Changer la langue", content);
assertContains("La page dâaccueil permet de faire une recherche simple", content);
- } finally {
- input.close();
}
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java Mon Aug 31 04:21:04 2015
@@ -136,13 +136,9 @@ public class PDFParserTest extends TikaT
Parser parser = new AutoDetectParser(); // Should auto-detect!
Metadata metadata = new Metadata();
- InputStream stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDF.pdf");
-
- try {
+ try (InputStream stream = PDFParserTest.class.getResourceAsStream(
+ "/test-documents/testPDF.pdf")) {
parser.parse(stream, null, metadata, new ParseContext());
- } finally {
- stream.close();
}
assertEquals("application/pdf", metadata.get(Metadata.CONTENT_TYPE));
@@ -188,12 +184,9 @@ public class PDFParserTest extends TikaT
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
- InputStream stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDF_protected.pdf");
- try {
+ try (InputStream stream = PDFParserTest.class.getResourceAsStream(
+ "/test-documents/testPDF_protected.pdf")) {
parser.parse(stream, handler, metadata, context);
- } finally {
- stream.close();
}
assertEquals("true", metadata.get("pdf:encrypted"));
@@ -221,12 +214,9 @@ public class PDFParserTest extends TikaT
}
});
- stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDF_protected.pdf");
- try {
+ try (InputStream stream = PDFParserTest.class.getResourceAsStream(
+ "/test-documents/testPDF_protected.pdf")) {
parser.parse(stream, handler, metadata, context);
- } finally {
- stream.close();
}
assertEquals("true", metadata.get("pdf:encrypted"));
@@ -250,15 +240,12 @@ public class PDFParserTest extends TikaT
}
});
- stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDF_protected.pdf");
boolean ex = false;
- try {
+ try (InputStream stream = PDFParserTest.class.getResourceAsStream(
+ "/test-documents/testPDF_protected.pdf")) {
parser.parse(stream, handler, metadata, context);
} catch (EncryptedDocumentException e) {
ex = true;
- } finally {
- stream.close();
}
content = handler.toString();
@@ -282,15 +269,13 @@ public class PDFParserTest extends TikaT
config.setUseNonSequentialParser(true);
context.set(PDFParserConfig.class, config);
- stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDF_protected.pdf");
+ ;
ex = false;
- try {
+ try (InputStream stream = PDFParserTest.class.getResourceAsStream(
+ "/test-documents/testPDF_protected.pdf")) {
parser.parse(stream, handler, metadata, context);
} catch (EncryptedDocumentException e) {
ex = true;
- } finally {
- stream.close();
}
content = handler.toString();
assertTrue("encryption exception", ex);
@@ -774,7 +759,6 @@ public class PDFParserTest extends TikaT
RecursiveParserWrapper p = new RecursiveParserWrapper(new AutoDetectParser(),
new BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.IGNORE, -1));
- TikaInputStream tis = null;
ParseContext context = new ParseContext();
PDFParserConfig config = new PDFParserConfig();
config.setExtractInlineImages(true);
@@ -782,14 +766,9 @@ public class PDFParserTest extends TikaT
context.set(org.apache.tika.parser.pdf.PDFParserConfig.class, config);
context.set(org.apache.tika.parser.Parser.class, p);
- try {
- tis = TikaInputStream.get(
- getResourceAsStream("/test-documents/testPDF_childAttachments.pdf"));
+ try (TikaInputStream tis = TikaInputStream.get(
+ getResourceAsStream("/test-documents/testPDF_childAttachments.pdf"))) {
p.parse(tis, new BodyContentHandler(-1), new Metadata(), context);
- } finally {
- if (tis != null) {
- tis.close();
- }
}
List<Metadata> metadatas = p.getMetadata();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java Mon Aug 31 04:21:04 2015
@@ -38,27 +38,21 @@ public class ArParserTest extends Abstra
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofText.ar");
- try {
+ try (InputStream stream = ArParserTest.class.getResourceAsStream(
+ "/test-documents/testARofText.ar")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/x-archive",
- metadata.get(Metadata.CONTENT_TYPE));
+ metadata.get(Metadata.CONTENT_TYPE));
String content = handler.toString();
assertContains("testTXT.txt", content);
assertContains("Test d'indexation de Txt", content);
assertContains("http://www.apache.org", content);
- stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofSND.ar");
- try {
+ try (InputStream stream = ArParserTest.class.getResourceAsStream(
+ "/test-documents/testARofSND.ar")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/x-archive",
@@ -77,12 +71,9 @@ public class ArParserTest extends Abstra
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofText.ar");
- try {
+ try (InputStream stream = ArParserTest.class.getResourceAsStream(
+ "/test-documents/testARofText.ar")) {
parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
}
assertEquals(1, tracker.filenames.size());
@@ -102,12 +93,9 @@ public class ArParserTest extends Abstra
}
tracker.reset();
- stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofSND.ar");
- try {
+ try (InputStream stream = ArParserTest.class.getResourceAsStream(
+ "/test-documents/testARofSND.ar")) {
parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
}
assertEquals(1, tracker.filenames.size());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java Mon Aug 31 04:21:04 2015
@@ -39,12 +39,9 @@ public class Bzip2ParserTest extends Abs
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Bzip2ParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tbz2");
- try {
+ try (InputStream stream = Bzip2ParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tbz2")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/x-bzip2", metadata.get(Metadata.CONTENT_TYPE));
@@ -80,13 +77,10 @@ public class Bzip2ParserTest extends Abs
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tbz2");
- try {
- parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
- }
+ try (InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tbz2")) {
+ parser.parse(stream, handler, metadata, trackingContext);
+ }
// Should find a single entry, for the (compressed) tar file
assertEquals(1, tracker.filenames.size());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java Mon Aug 31 04:21:04 2015
@@ -39,12 +39,9 @@ public class GzipParserTest extends Abst
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = GzipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tgz");
- try {
+ try (InputStream stream = GzipParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tgz")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/gzip", metadata.get(Metadata.CONTENT_TYPE));
@@ -79,13 +76,10 @@ public class GzipParserTest extends Abst
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tgz");
- try {
- parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
- }
+ try (InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tgz")) {
+ parser.parse(stream, handler, metadata, trackingContext);
+ }
// Should find a single entry, for the (compressed) tar file
assertEquals(1, tracker.filenames.size());
@@ -106,12 +100,9 @@ public class GzipParserTest extends Abst
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = GzipParserTest.class.getResourceAsStream(
- "/test-documents/testSVG.svgz");
- try {
+ try (InputStream stream = GzipParserTest.class.getResourceAsStream(
+ "/test-documents/testSVG.svgz")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/gzip", metadata.get(Metadata.CONTENT_TYPE));
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java Mon Aug 31 04:21:04 2015
@@ -41,12 +41,9 @@ public class RarParserTest extends Abstr
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = RarParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.rar");
- try {
+ try (InputStream stream = RarParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.rar")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/x-rar-compressed", metadata.get(Metadata.CONTENT_TYPE));
@@ -81,13 +78,10 @@ public class RarParserTest extends Abstr
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = RarParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.rar");
- try {
- parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
- }
+ try (InputStream stream = RarParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.rar")) {
+ parser.parse(stream, handler, metadata, trackingContext);
+ }
// Should have found all 9 documents, but not the directory
assertEquals(9, tracker.filenames.size());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java Mon Aug 31 04:21:04 2015
@@ -55,12 +55,9 @@ public class Seven7ParserTest extends Ab
parser.getSupportedTypes(recursingContext).contains(TYPE_7ZIP));
// Parse
- InputStream stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.7z");
- try {
+ try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.7z")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals(TYPE_7ZIP.toString(), metadata.get(Metadata.CONTENT_TYPE));
@@ -95,13 +92,10 @@ public class Seven7ParserTest extends Ab
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.7z");
- try {
- parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
- }
+ try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.7z")) {
+ parser.parse(stream, handler, metadata, trackingContext);
+ }
// Should have found all 9 documents, but not the directory
assertEquals(9, tracker.filenames.size());
@@ -136,17 +130,14 @@ public class Seven7ParserTest extends Ab
Metadata metadata = new Metadata();
// No password, will fail with EncryptedDocumentException
- InputStream stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z");
boolean ex = false;
- try {
+ try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
+ "/test-documents/test7Z_protected_passTika.7z")) {
parser.parse(stream, handler, metadata, recursingContext);
fail("Shouldn't be able to read a password protected 7z without the password");
} catch (EncryptedDocumentException e) {
// Good
ex = true;
- } finally {
- stream.close();
}
assertTrue("test no password", ex);
@@ -162,9 +153,8 @@ public class Seven7ParserTest extends Ab
}
});
handler = new BodyContentHandler();
- stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z");
- try {
+ try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
+ "/test-documents/test7Z_protected_passTika.7z")) {
parser.parse(stream, handler, metadata, recursingContext);
fail("Shouldn't be able to read a password protected 7z with wrong password");
} catch (TikaException e) {
@@ -172,8 +162,6 @@ public class Seven7ParserTest extends Ab
//if JCE is not installed, the message will include
// "(do you have the JCE Unlimited Strength Jurisdiction Policy Files installed?")
ex = true;
- } finally {
- stream.close();
}
assertTrue("TikaException for bad password", ex);
// Will be empty
@@ -189,12 +177,9 @@ public class Seven7ParserTest extends Ab
}
});
handler = new BodyContentHandler();
- stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z");
- try {
+ try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
+ "/test-documents/test7Z_protected_passTika.7z")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals(TYPE_7ZIP.toString(), metadata.get(Metadata.CONTENT_TYPE));
@@ -218,14 +203,11 @@ public class Seven7ParserTest extends Ab
}
});
handler = new BodyContentHandler();
- stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z");
- try {
+ try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
+ "/test-documents/test7Z_protected_passTika.7z")) {
parser.parse(stream, handler, metadata, recursingContext);
} catch (TikaException e) {
ioe = true;
- } finally {
- stream.close();
}
assertTrue("IOException because JCE was not installed", ioe);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java Mon Aug 31 04:21:04 2015
@@ -41,12 +41,9 @@ public class TarParserTest extends Abstr
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = TarParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tar");
- try {
+ try (InputStream stream = TarParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tar")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/x-tar", metadata.get(Metadata.CONTENT_TYPE));
@@ -81,13 +78,10 @@ public class TarParserTest extends Abstr
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tar");
- try {
- parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
- }
+ try (InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tar")) {
+ parser.parse(stream, handler, metadata, trackingContext);
+ }
// Should have found all 9 documents, but not the directory
assertEquals(9, tracker.filenames.size());