This is an automated email from the ASF dual-hosted git repository.
kkrugler pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new faad4c3 Simplify some test code by using method
TikaTest#getResourceAsStream
new 37f0559 Merge pull request #384 from
PeterAlfredLee/simplify_getResourceAsStream
faad4c3 is described below
commit faad4c316634880df054dc6178e18f172a132d4e
Author: PeterAlfredLee <[email protected]>
AuthorDate: Tue Nov 17 10:58:56 2020 +0800
Simplify some test code by using method TikaTest#getResourceAsStream
---
.../tika/batch/CommandLineParserBuilderTest.java | 2 +-
.../RecursiveParserWrapperFSConsumerTest.java | 4 +-
.../org/apache/tika/batch/fs/FSBatchTestBase.java | 2 +-
.../java/org/apache/tika/fork/ForkParserTest.java | 12 +++---
.../apache/tika/fork/ForkParserTikaBinTest.java | 2 +-
.../apache/tika/parser/iwork/IWorkParserTest.java | 2 +-
.../tika/parser/iwork/iwana/IWork13ParserTest.java | 6 +--
.../org/apache/tika/parser/mp4/MP4ParserTest.java | 3 +-
.../apache/tika/parser/sas/SAS7BDATParserTest.java | 6 +--
.../apache/tika/parser/crypto/Pkcs7ParserTest.java | 3 +-
.../apache/tika/parser/crypto/TSDParserTest.java | 18 +++------
.../apache/tika/parser/html/HtmlParserTest.java | 39 ++++++++----------
.../apache/tika/parser/image/ImageParserTest.java | 10 ++---
.../apache/tika/parser/image/PSDParserTest.java | 4 +-
.../tika/detect/TestContainerAwareDetector.java | 3 +-
.../apache/tika/parser/AutoDetectParserTest.java | 8 ++--
.../org/apache/tika/parser/ParsingReaderTest.java | 3 +-
.../tika/parser/RecursiveParserWrapperTest.java | 30 +++++---------
.../parser/fork/ForkParserIntegrationTest.java | 17 +++-----
.../apache/tika/parser/html/HtmlParserTest.java | 2 +-
.../org/apache/tika/parser/pdf/PDFParserTest.java | 3 +-
.../org/apache/tika/parser/pkg/ArParserTest.java | 6 +--
.../apache/tika/parser/pkg/Bzip2ParserTest.java | 3 +-
.../apache/tika/parser/pkg/CompressParserTest.java | 2 +-
.../org/apache/tika/parser/pkg/GzipParserTest.java | 6 +--
.../org/apache/tika/parser/pkg/RarParserTest.java | 3 +-
.../apache/tika/parser/pkg/Seven7ParserTest.java | 15 +++----
.../org/apache/tika/parser/pkg/TarParserTest.java | 3 +-
.../org/apache/tika/parser/pkg/ZipParserTest.java | 3 +-
.../org/apache/tika/parser/pkg/ZlibParserTest.java | 3 +-
.../sax/PhoneExtractingContentHandlerTest.java | 2 +-
.../sax/StandardsExtractingContentHandlerTest.java | 2 +-
.../tika/parser/microsoft/ExcelParserTest.java | 47 +++++++++-------------
.../tika/parser/microsoft/OfficeParserTest.java | 2 +-
.../tika/parser/microsoft/OutlookParserTest.java | 18 +++------
.../parser/microsoft/PowerPointParserTest.java | 15 +++----
.../parser/microsoft/SolidworksParserTest.java | 18 +++------
.../tika/parser/microsoft/WordParserTest.java | 20 ++++-----
.../parser/microsoft/chm/TestChmExtraction.java | 6 +--
.../parser/microsoft/ooxml/OOXMLParserTest.java | 26 +++++-------
.../parser/microsoft/ooxml/SXSLFExtractorTest.java | 2 +-
.../parser/microsoft/ooxml/SXWPFExtractorTest.java | 2 +-
.../tika/parser/microsoft/rtf/RTFParserTest.java | 5 +--
.../org/apache/tika/parser/dif/DIFParserTest.java | 3 +-
.../apache/tika/parser/epub/EpubParserTest.java | 2 +-
.../org/apache/tika/parser/odf/ODFParserTest.java | 23 ++++-------
.../tika/parser/wordperfect/WordPerfectTest.java | 2 +-
.../tika/parser/ocr/TesseractOCRConfigTest.java | 6 +--
.../org/apache/tika/parser/pdf/PDFParserTest.java | 21 ++++------
.../org/apache/tika/parser/pkg/ArParserTest.java | 6 +--
.../apache/tika/parser/pkg/Bzip2ParserTest.java | 3 +-
.../apache/tika/parser/pkg/CompressParserTest.java | 2 +-
.../org/apache/tika/parser/pkg/GzipParserTest.java | 3 +-
.../org/apache/tika/parser/pkg/RarParserTest.java | 6 +--
.../apache/tika/parser/pkg/Seven7ParserTest.java | 3 +-
.../org/apache/tika/parser/pkg/TarParserTest.java | 3 +-
.../org/apache/tika/parser/pkg/ZipParserTest.java | 10 ++---
.../org/apache/tika/parser/pkg/ZlibParserTest.java | 3 +-
.../org/apache/tika/parser/txt/TXTParserTest.java | 4 +-
.../tika/parser/xliff/XLIFF12ParserTest.java | 2 +-
.../apache/tika/parser/xml/DcXMLParserTest.java | 5 +--
.../EmptyAndDuplicateElementsXMLParserTest.java | 6 +--
.../tika/parser/xmp/JempboxExtractorTest.java | 8 ++--
.../tika/parser/recognition/AgeRecogniserTest.java | 2 +-
.../tika/parser/ner/NamedEntityParserTest.java | 4 +-
65 files changed, 196 insertions(+), 319 deletions(-)
diff --git
a/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java
b/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java
index 12be8a8..adc85db 100644
---
a/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java
+++
b/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java
@@ -29,7 +29,7 @@ public class CommandLineParserBuilderTest extends
FSBatchTestBase {
@Test
public void testBasic() throws Exception {
- try (InputStream is =
this.getClass().getResourceAsStream("/tika-batch-config-test.xml")) {
+ try (InputStream is =
getResourceAsStream("/tika-batch-config-test.xml")) {
CommandLineParserBuilder builder = new CommandLineParserBuilder();
Options options = builder.build(is);
//TODO: insert actual tests :)
diff --git
a/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java
b/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java
index 680df42..aa92a78 100644
---
a/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java
+++
b/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java
@@ -67,7 +67,7 @@ public class RecursiveParserWrapperFSConsumerTest extends
TikaTest {
@Override
public InputStream openInputStream() throws IOException {
- return this.getClass().getResourceAsStream(path);
+ return getResourceAsStream(path);
}
});
queue.add(new PoisonFileResource());
@@ -115,7 +115,7 @@ public class RecursiveParserWrapperFSConsumerTest extends
TikaTest {
@Override
public InputStream openInputStream() throws IOException {
- return this.getClass().getResourceAsStream(path);
+ return getResourceAsStream(path);
}
});
queue.add(new PoisonFileResource());
diff --git
a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
index 558f2b4..7631471 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
@@ -148,7 +148,7 @@ public abstract class FSBatchTestBase extends TikaTest {
BatchProcess getNewBatchRunner(String testConfig,
Map<String, String> args) throws IOException
{
- InputStream is = this.getClass().getResourceAsStream(testConfig);
+ InputStream is = getResourceAsStream(testConfig);
BatchProcessBuilder b = new BatchProcessBuilder();
BatchProcess runner = b.build(is, args);
diff --git a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
index ca86c51..132bc78 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
@@ -251,7 +251,7 @@ public class ForkParserTest extends TikaTest {
ForkParser fork = new
ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
- try (InputStream is =
getClass().getResourceAsStream("/test-documents/basic_embedded.xml")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/basic_embedded.xml")) {
fork.parse(is, handler, metadata, context);
} finally {
fork.close();
@@ -278,7 +278,7 @@ public class ForkParserTest extends TikaTest {
ForkParser fork = new
ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
- try (InputStream is =
getClass().getResourceAsStream("/test-documents/embedded_with_npe.xml")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/embedded_with_npe.xml")) {
fork.parse(is, handler, metadata, context);
} finally {
fork.close();
@@ -306,7 +306,7 @@ public class ForkParserTest extends TikaTest {
ForkParser fork = new
ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
- try (InputStream is =
getClass().getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
fork.parse(is, handler, metadata, context);
fail();
} catch (TikaException e) {
@@ -334,7 +334,7 @@ public class ForkParserTest extends TikaTest {
Path target = Files.createTempFile("fork-to-file-handler-", ".txt");
try {
ForkParser forkParser = null;
- try (InputStream is =
this.getClass().getResourceAsStream("/test-documents/basic_embedded.xml")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/basic_embedded.xml")) {
RecursiveParserWrapper wrapper = new
RecursiveParserWrapper(new AutoDetectParser());
ToFileHandler toFileHandler = new ToFileHandler(new
SBContentHandlerFactory(), target.toFile());
forkParser = new
ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
@@ -372,7 +372,7 @@ public class ForkParserTest extends TikaTest {
ForkParser fork = new
ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
- try (InputStream is =
getClass().getResourceAsStream("/test-documents/basic_embedded.xml")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/basic_embedded.xml")) {
fork.parse(is, handler, metadata, context);
} finally {
fork.close();
@@ -402,7 +402,7 @@ public class ForkParserTest extends TikaTest {
ForkParser fork = new
ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
- try (InputStream is =
getClass().getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
fork.parse(is, handler, metadata, context);
fail();
} catch (TikaException e) {
diff --git
a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
index 851362e..f06525f 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
@@ -187,7 +187,7 @@ public class ForkParserTikaBinTest extends TikaTest {
ContentHandler handler = (contentHandler == null) ? new
ToXMLContentHandler() : contentHandler;
Metadata m = new Metadata();
- try (InputStream is =
getClass().getResourceAsStream("/test-documents/example.xml")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/example.xml")) {
parser.parse(is, handler, m, new ParseContext());
} finally {
parser.close();
diff --git
a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
b/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
index cefc5ef..5c4d5d1 100644
---
a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
+++
b/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
@@ -52,7 +52,7 @@ public class IWorkParserTest extends TikaTest {
*/
@Test
public void testStreamNotClosed() throws Exception {
- InputStream input =
IWorkParserTest.class.getResourceAsStream("/test-documents/testKeynote.key");
+ InputStream input =
getResourceAsStream("/test-documents/testKeynote.key");
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
iWorkParser.parse(input, handler, metadata);
diff --git
a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
b/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
index 8bdf684..0246fd7 100644
---
a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
+++
b/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
@@ -46,7 +46,7 @@ public class IWork13ParserTest extends TikaTest {
@Test
public void testParseKeynote13() throws Exception {
- InputStream input =
IWork13ParserTest.class.getResourceAsStream("/test-documents/testKeynote2013.key");
+ InputStream input =
getResourceAsStream("/test-documents/testKeynote2013.key");
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
iWorkParser.parse(input, handler, metadata, parseContext);
@@ -60,7 +60,7 @@ public class IWork13ParserTest extends TikaTest {
@Test
public void testParseNumbers13() throws Exception {
- InputStream input =
IWork13ParserTest.class.getResourceAsStream("/test-documents/testNumbers2013.numbers");
+ InputStream input =
getResourceAsStream("/test-documents/testNumbers2013.numbers");
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
iWorkParser.parse(input, handler, metadata, parseContext);
@@ -74,7 +74,7 @@ public class IWork13ParserTest extends TikaTest {
@Test
public void testParsePages13() throws Exception {
- InputStream input =
IWork13ParserTest.class.getResourceAsStream("/test-documents/testPages2013.pages");
+ InputStream input =
getResourceAsStream("/test-documents/testPages2013.pages");
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
iWorkParser.parse(input, handler, metadata, parseContext);
diff --git
a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
b/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
index 4b12002..cba30cf 100644
---
a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
+++
b/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
@@ -83,8 +83,7 @@ public class MP4ParserTest extends TikaTest {
// Check again by file, rather than stream
- TikaInputStream tstream = TikaInputStream.get(
-
MP4ParserTest.class.getResourceAsStream("/test-documents/testMP4.m4a"));
+ TikaInputStream tstream =
TikaInputStream.get(getResourceAsStream("/test-documents/testMP4.m4a"));
tstream.getFile();
ContentHandler handler = new BodyContentHandler();
try {
diff --git
a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
index 96addba..8afb52a 100644
---
a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
+++
b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
@@ -46,8 +46,7 @@ public class SAS7BDATParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = SAS7BDATParserTest.class.getResourceAsStream(
- "/test-documents/testSAS.sas7bdat")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testSAS.sas7bdat")) {
parser.parse(stream, handler, metadata, new ParseContext());
}
@@ -82,8 +81,7 @@ public class SAS7BDATParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = SAS7BDATParserTest.class.getResourceAsStream(
- "/test-documents/test-columnar.sas7bdat")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-columnar.sas7bdat")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
diff --git
a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
index 794b02e..d760b54 100644
---
a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
+++
b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
@@ -31,8 +31,7 @@ import org.xml.sax.ContentHandler;
public class Pkcs7ParserTest extends TikaTest {
public void testDetachedSignature() throws Exception {
- try (InputStream input = Pkcs7ParserTest.class.getResourceAsStream(
- "/test-documents/testDetached.p7s")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testDetached.p7s")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new Pkcs7Parser().parse(input, handler, metadata, new
ParseContext());
diff --git
a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
index 6253316..1a4cf96 100644
---
a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
+++
b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
@@ -35,18 +35,12 @@ public class TSDParserTest extends TikaTest {
@Test
public void testTSDFileData() throws Exception {
- try (InputStream inputXml =
-
TSDParserTest.class.getResourceAsStream("/test-documents/MANIFEST.XML.TSD");
- InputStream inputTxt1 =
-
TSDParserTest.class.getResourceAsStream("/test-documents/Test1.txt.tsd");
- InputStream inputTxt2 =
-
TSDParserTest.class.getResourceAsStream("/test-documents/Test2.txt.tsd");
- InputStream inputDocx =
-
TSDParserTest.class.getResourceAsStream("/test-documents/Test3.docx.tsd");
- InputStream inputPdf =
-
TSDParserTest.class.getResourceAsStream("/test-documents/Test4.pdf.tsd");
- InputStream inputPng =
-
TSDParserTest.class.getResourceAsStream("/test-documents/Test5.PNG.tsd");) {
+ try (InputStream inputXml =
getResourceAsStream("/test-documents/MANIFEST.XML.TSD");
+ InputStream inputTxt1 =
getResourceAsStream("/test-documents/Test1.txt.tsd");
+ InputStream inputTxt2 =
getResourceAsStream("/test-documents/Test2.txt.tsd");
+ InputStream inputDocx =
getResourceAsStream("/test-documents/Test3.docx.tsd");
+ InputStream inputPdf =
getResourceAsStream("/test-documents/Test4.pdf.tsd");
+ InputStream inputPng =
getResourceAsStream("/test-documents/Test5.PNG.tsd")) {
TSDParser tsdParser = new TSDParser();
diff --git
a/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
b/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
index 9e18a75..a65fe12 100644
---
a/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
+++
b/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -92,7 +92,7 @@ public class HtmlParserTest extends TikaTest {
final StringWriter name = new StringWriter();
ContentHandler body = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream =
HtmlParserTest.class.getResourceAsStream(path)) {
+ try (InputStream stream = getResourceAsStream(path)) {
ContentHandler link = new DefaultHandler() {
@Override
public void startElement(
@@ -137,8 +137,7 @@ public class HtmlParserTest extends TikaTest {
public void XtestParseUTF8() throws IOException, SAXException,
TikaException {
String path = "/test-documents/testXHTML_utf8.html";
Metadata metadata = new Metadata();
- String content = new Tika().parseToString(
- HtmlParserTest.class.getResourceAsStream(path), metadata);
+ String content = new Tika().parseToString(getResourceAsStream(path),
metadata);
assertTrue("Did not contain expected text:"
+ "Title : Tilte with UTF-8 chars öäå", content
@@ -156,8 +155,7 @@ public class HtmlParserTest extends TikaTest {
public void testXhtmlParsing() throws Exception {
String path = "/test-documents/testXHTML.html";
Metadata metadata = new Metadata();
- String content = new Tika().parseToString(
- HtmlParserTest.class.getResourceAsStream(path), metadata);
+ String content = new Tika().parseToString(getResourceAsStream(path),
metadata);
//can't specify charset because default differs between OS's
assertTrue(metadata.get(Metadata.CONTENT_TYPE).startsWith("application/xhtml+xml;
charset="));
@@ -460,7 +458,7 @@ public class HtmlParserTest extends TikaTest {
String path = "/test-documents/big-preamble.html";
Metadata metadata = new Metadata();
new HtmlParser().parse(
- HtmlParserTest.class.getResourceAsStream(path),
+ getResourceAsStream(path),
new BodyContentHandler(), metadata, new ParseContext());
assertEquals("windows-1251", metadata.get(Metadata.CONTENT_ENCODING));
@@ -478,7 +476,7 @@ public class HtmlParserTest extends TikaTest {
Metadata metadata = new Metadata();
BodyContentHandler handler = new BodyContentHandler();
new HtmlParser().parse(
- HtmlParserTest.class.getResourceAsStream(path),
+ getResourceAsStream(path),
new BoilerpipeContentHandler(handler), metadata, new
ParseContext());
String content = handler.toString();
@@ -732,7 +730,7 @@ public class HtmlParserTest extends TikaTest {
Metadata metadata = new Metadata();
StringWriter sw = new StringWriter();
new HtmlParser().parse(
- HtmlParserTest.class.getResourceAsStream(path),
+ getResourceAsStream(path),
makeHtmlTransformer(sw), metadata, new ParseContext());
String content = sw.toString();
@@ -802,7 +800,7 @@ public class HtmlParserTest extends TikaTest {
bpch.setIncludeMarkup(true);
new HtmlParser().parse(
- HtmlParserTest.class.getResourceAsStream(path),
+ getResourceAsStream(path),
bpch, metadata, new ParseContext());
String content = sw.toString();
@@ -820,7 +818,7 @@ public class HtmlParserTest extends TikaTest {
@Test
public void testPushback() throws IOException, TikaException {
String content = new Tika().parseToString(
-
HtmlParserTest.class.getResourceAsStream("/test-documents/tika434.html"), new
Metadata());
+ getResourceAsStream("/test-documents/tika434.html"), new
Metadata());
assertNotNull(content);
}
@@ -905,9 +903,7 @@ public class HtmlParserTest extends TikaTest {
BoilerpipeContentHandler bpHandler = new
BoilerpipeContentHandler(handler);
bpHandler.setIncludeMarkup(true);
- new HtmlParser().parse(
- HtmlParserTest.class.getResourceAsStream(path),
- bpHandler, metadata, new ParseContext());
+ new HtmlParser().parse(getResourceAsStream(path), bpHandler, metadata,
new ParseContext());
String content = handler.toString();
@@ -936,9 +932,7 @@ public class HtmlParserTest extends TikaTest {
BoilerpipeContentHandler bpHandler = new
BoilerpipeContentHandler(handler);
bpHandler.setIncludeMarkup(true);
- new HtmlParser().parse(
- HtmlParserTest.class.getResourceAsStream(path),
- bpHandler, metadata, new ParseContext());
+ new HtmlParser().parse(getResourceAsStream(path), bpHandler, metadata,
new ParseContext());
String content = handler.toString();
@@ -975,7 +969,7 @@ public class HtmlParserTest extends TikaTest {
@Test
public void testUserDefinedCharset() throws Exception {
String content = new Tika().parseToString(
-
HtmlParserTest.class.getResourceAsStream("/test-documents/testUserDefinedCharset.mhtml"),
new Metadata());
+
getResourceAsStream("/test-documents/testUserDefinedCharset.mhtml"), new
Metadata());
assertNotNull(content);
}
@@ -987,8 +981,7 @@ public class HtmlParserTest extends TikaTest {
for (int i = 1; i <= 4; i++) {
String fileName = "/test-documents/testHTMLNoisyMetaEncoding_" + i
+ ".html";
- String content = tika.parseToString(
- HtmlParserTest.class.getResourceAsStream(fileName));
+ String content = tika.parseToString(getResourceAsStream(fileName));
assertTrue("testing: " + fileName, content.contains(hit));
}
}
@@ -1035,7 +1028,7 @@ public class HtmlParserTest extends TikaTest {
final int col = 1;
final int[] textPosition = new int[2];
- new
HtmlParser().parse(HtmlParserTest.class.getResourceAsStream("/test-documents/testHTML.html"),
+ new
HtmlParser().parse(getResourceAsStream("/test-documents/testHTML.html"),
new ContentHandler() {
Locator locator;
@@ -1234,7 +1227,7 @@ public class HtmlParserTest extends TikaTest {
final Map<String, Integer> tagFrequencies = new HashMap<>();
String path = "/test-documents/testHTML_head.html";
- try (InputStream stream =
HtmlParserTest.class.getResourceAsStream(path)) {
+ try (InputStream stream = getResourceAsStream(path)) {
ContentHandler tagCounter = new DefaultHandler() {
@Override
public void startElement(
@@ -1303,7 +1296,7 @@ public class HtmlParserTest extends TikaTest {
@Test
public void testConfigExtractScript() throws Exception {
- try (InputStream is =
getClass().getResourceAsStream("/org/apache/tika/parser/html/tika-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/html/tika-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
@@ -1425,7 +1418,7 @@ public class HtmlParserTest extends TikaTest {
metadataList.get(0).get(RecursiveParserWrapperHandler.TIKA_CONTENT));
//make sure to include it if a user wants scripts to be extracted
- try (InputStream is =
getClass().getResourceAsStream("/org/apache/tika/parser/html/tika-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/html/tika-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
diff --git
a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
b/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
index 4b3f2b2..fcf6aae 100644
---
a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
+++
b/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
@@ -36,7 +36,7 @@ public class ImageParserTest extends TikaTest {
public void testBMP() throws Exception {
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/bmp");
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testBMP.bmp")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testBMP.bmp")) {
parser.parse(stream, new DefaultHandler(), metadata, new
ParseContext());
}
@@ -59,7 +59,7 @@ public class ImageParserTest extends TikaTest {
public void testGIF() throws Exception {
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/gif");
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testGIF.gif")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testGIF.gif")) {
parser.parse(stream, new DefaultHandler(), metadata, new
ParseContext());
}
@@ -90,7 +90,7 @@ public class ImageParserTest extends TikaTest {
public void testJPEG() throws Exception {
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/jpeg");
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testJPEG.jpg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testJPEG.jpg")) {
parser.parse(stream, new DefaultHandler(), metadata, new
ParseContext());
}
@@ -126,7 +126,7 @@ public class ImageParserTest extends TikaTest {
public void testPNG() throws Exception {
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/png");
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testPNG.png")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPNG.png")) {
parser.parse(stream, new DefaultHandler(), metadata, new
ParseContext());
}
@@ -164,7 +164,7 @@ public class ImageParserTest extends TikaTest {
public void testJBIG2() throws Exception {
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/x-jbig2");
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testJBIG2.jb2")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testJBIG2.jb2")) {
parser.parse(stream, new DefaultHandler(), metadata, new
ParseContext());
}
assertEquals("78", metadata.get("height"));
diff --git
a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
b/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
index abf3874..657de5d 100644
---
a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
+++
b/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
@@ -39,7 +39,7 @@ public class PSDParserTest extends TikaTest {
public void testPSD() throws Exception {
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/x-psd");
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testPSD.psd")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPSD.psd")) {
parser.parse(stream, new DefaultHandler(), metadata, new
ParseContext());
}
@@ -56,7 +56,7 @@ public class PSDParserTest extends TikaTest {
public void testOddPSD() throws Exception {
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/x-psd");
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testPSD2.psd")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPSD2.psd")) {
parser.parse(stream, new DefaultHandler(), metadata, new
ParseContext());
}
assertEquals("69", metadata.get(Metadata.IMAGE_WIDTH));
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
index 676811d..72be09f 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
@@ -458,8 +458,7 @@ public class TestContainerAwareDetector extends
MultiThreadedTikaTest {
private TikaInputStream getTruncatedFile(String name, int n)
throws IOException {
- try (InputStream input =
TestContainerAwareDetector.class.getResourceAsStream(
- "/test-documents/" + name)) {
+ try (InputStream input = getResourceAsStream("/test-documents/" +
name)) {
byte[] bytes = new byte[n];
int m = 0;
while (m < bytes.length) {
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
index 5e84d0d..0c82525 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
@@ -85,7 +85,7 @@ public class AutoDetectParserTest extends TikaTest {
* @throws IOException
*/
private void assertAutoDetect(TestParams tp) throws Exception {
- try (InputStream input =
AutoDetectParserTest.class.getResourceAsStream(tp.resourceRealName)) {
+ try (InputStream input = getResourceAsStream(tp.resourceRealName)) {
if (input == null) {
fail("Could not open stream from specified resource: "
+ tp.resourceRealName);
@@ -259,8 +259,7 @@ public class AutoDetectParserTest extends TikaTest {
*/
@Test
public void testZipBombPrevention() throws Exception {
- try (InputStream tgz = AutoDetectParserTest.class.getResourceAsStream(
- "/test-documents/TIKA-216.tgz")) {
+ try (InputStream tgz =
getResourceAsStream("/test-documents/TIKA-216.tgz")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler(-1);
new AutoDetectParser(tika).parse(tgz, handler, metadata);
@@ -331,8 +330,7 @@ public class AutoDetectParserTest extends TikaTest {
// Have each file parsed, and check
for (int i=0; i<testFiles.length; i++) {
String file = testFiles[i];
- try (InputStream input =
AutoDetectParserTest.class.getResourceAsStream(
- "/test-documents/" + file)) {
+ try (InputStream input = getResourceAsStream("/test-documents/" +
file)) {
if (input == null) {
fail("Could not find test file " + file);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
index 33bac07..f9f8bc8 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
@@ -86,8 +86,7 @@ public class ParsingReaderTest extends TikaTest {
@Test
public void testMetadata() throws Exception {
Metadata metadata = new Metadata();
- InputStream stream = ParsingReaderTest.class.getResourceAsStream(
- "/test-documents/testEXCEL.xls");
+ InputStream stream =
getResourceAsStream("/test-documents/testEXCEL.xls");
try (Reader reader = new ParsingReader(
AUTO_DETECT_PARSER, stream, metadata, new ParseContext())) {
// Metadata should already be available
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
index 3781552..60a99c4 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
@@ -95,8 +95,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
Metadata metadata = new Metadata();
RecursiveParserWrapper wrapper = new
RecursiveParserWrapper(AUTO_DETECT_PARSER);
- InputStream stream =
RecursiveParserWrapperTest.class.getResourceAsStream(
- "/test-documents/test_recursive_embedded.docx");
+ InputStream stream =
getResourceAsStream("/test-documents/test_recursive_embedded.docx");
RecursiveParserWrapperHandler handler = new
RecursiveParserWrapperHandler(
new
BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.TEXT, 60));
wrapper.parse(stream, handler, metadata, context);
@@ -130,8 +129,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
RecursiveParserWrapper wrapper = new
RecursiveParserWrapper(AUTO_DETECT_PARSER,
new
BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.TEXT, -1));
- InputStream stream =
RecursiveParserWrapperTest.class.getResourceAsStream(
- "/test-documents/test_recursive_embedded.docx");
+ InputStream stream =
getResourceAsStream("/test-documents/test_recursive_embedded.docx");
wrapper.parse(stream, new DefaultHandler(), metadata, context);
List<Metadata> list = wrapper.getMetadata();
//test default
@@ -146,8 +144,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
//test setting value
metadata = new Metadata();
- stream = RecursiveParserWrapperTest.class.getResourceAsStream(
- "/test-documents/test_recursive_embedded.docx");
+ stream =
getResourceAsStream("/test-documents/test_recursive_embedded.docx");
wrapper.setMaxEmbeddedResources(maxEmbedded);
wrapper.parse(stream, new DefaultHandler(), metadata, context);
list = wrapper.getMetadata();
@@ -163,8 +160,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
//test setting value < 0
metadata = new Metadata();
- stream = RecursiveParserWrapperTest.class.getResourceAsStream(
- "/test-documents/test_recursive_embedded.docx");
+ stream =
getResourceAsStream("/test-documents/test_recursive_embedded.docx");
wrapper.setMaxEmbeddedResources(-2);
wrapper.parse(stream, new DefaultHandler(), metadata, context);
@@ -183,8 +179,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
RecursiveParserWrapper wrapper = new
RecursiveParserWrapper(AUTO_DETECT_PARSER);
- InputStream stream =
RecursiveParserWrapperTest.class.getResourceAsStream(
- "/test-documents/test_recursive_embedded.docx");
+ InputStream stream =
getResourceAsStream("/test-documents/test_recursive_embedded.docx");
RecursiveParserWrapperHandler handler = new
RecursiveParserWrapperHandler(
new
BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.TEXT,-1));
@@ -200,8 +195,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
//test setting value
metadata = new Metadata();
- stream = RecursiveParserWrapperTest.class.getResourceAsStream(
- "/test-documents/test_recursive_embedded.docx");
+ stream =
getResourceAsStream("/test-documents/test_recursive_embedded.docx");
handler = new RecursiveParserWrapperHandler(
new
BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.TEXT, -1),
maxEmbedded);
wrapper.parse(stream, handler, metadata, context);
@@ -216,8 +210,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
//test setting value < 0
metadata = new Metadata();
- stream = RecursiveParserWrapperTest.class.getResourceAsStream(
- "/test-documents/test_recursive_embedded.docx");
+ stream =
getResourceAsStream("/test-documents/test_recursive_embedded.docx");
handler = new RecursiveParserWrapperHandler(
new
BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.TEXT,-1),
-2);
wrapper.parse(stream, handler, metadata, context);
@@ -304,8 +297,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
InputStream stream = null;
boolean npe = false;
try {
- stream = RecursiveParserWrapperTest.class.getResourceAsStream(
- path);
+ stream = getResourceAsStream(path);
wrapper.parse(stream, handler, metadata, context);
} catch (TikaException e) {
if (e.getCause().getClass().equals(NullPointerException.class)) {
@@ -358,7 +350,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
CloseCountingInputStream stream = null;
RecursiveParserWrapperHandler handler = new
RecursiveParserWrapperHandler(contentHandlerFactory);
try {
- stream = new
CloseCountingInputStream(RecursiveParserWrapperTest.class.getResourceAsStream(path));
+ stream = new CloseCountingInputStream(getResourceAsStream(path));
wrapper.parse(stream, handler, metadata, context);
assertEquals(0, stream.counter);
} finally {
@@ -374,7 +366,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
Metadata metadata = new Metadata();
TikaConfig tikaConfig = null;
Parser p = null;
- try (InputStream is =
getClass().getResourceAsStream("TIKA-3137-include.xml")) {
+ try (InputStream is = getResourceAsStream("TIKA-3137-include.xml")) {
tikaConfig = new TikaConfig(is);
p = new AutoDetectParser(tikaConfig);
}
@@ -386,7 +378,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
RecursiveParserWrapperHandler handler = new
RecursiveParserWrapperHandler(contentHandlerFactory,
-1, tikaConfig.getMetadataFilter());
- try (InputStream is = getClass().getResourceAsStream(path)) {
+ try (InputStream is = getResourceAsStream(path)) {
wrapper.parse(is, handler, metadata, context);
}
List<Metadata> metadataList = handler.getMetadataList();
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
index 0801798..f35d610 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
@@ -63,8 +63,7 @@ public class ForkParserIntegrationTest extends
MultiThreadedTikaTest {
public void testForkedTextParsing() throws Exception {
try (ForkParser parser = new
ForkParser(ForkParserIntegrationTest.class.getClassLoader(), tika.getParser()))
{
ContentHandler output = new BodyContentHandler();
- InputStream stream =
ForkParserIntegrationTest.class.getResourceAsStream(
- "/test-documents/testTXT.txt");
+ InputStream stream =
getResourceAsStream("/test-documents/testTXT.txt");
ParseContext context = new ParseContext();
parser.parse(stream, output, new Metadata(), context);
@@ -153,7 +152,7 @@ public class ForkParserIntegrationTest extends
MultiThreadedTikaTest {
public void testParsingErrorInForkedParserShouldBeReported() throws
Exception {
BrokenParser brokenParser = new BrokenParser();
ForkParser parser = new ForkParser(ForkParser.class.getClassLoader(),
brokenParser);
- InputStream stream =
getClass().getResourceAsStream("/test-documents/testTXT.txt");
+ InputStream stream =
getResourceAsStream("/test-documents/testTXT.txt");
// With a serializable error, we'll get that back
try {
@@ -203,8 +202,7 @@ public class ForkParserIntegrationTest extends
MultiThreadedTikaTest {
try {
ContentHandler output = new BodyContentHandler();
- InputStream stream =
ForkParserIntegrationTest.class.getResourceAsStream(
- "/test-documents/testTXT.txt");
+ InputStream stream =
getResourceAsStream("/test-documents/testTXT.txt");
parser.parse(stream, output, new Metadata(), context);
fail("Should have blown up with a non serializable ParseContext");
} catch(TikaException e) {
@@ -233,8 +231,7 @@ public class ForkParserIntegrationTest extends
MultiThreadedTikaTest {
"-Xrunjdwp:transport=dt_socket,address=54321,server=y,suspend=n"));
try {
ContentHandler body = new BodyContentHandler();
- InputStream stream =
ForkParserIntegrationTest.class.getResourceAsStream(
- "/test-documents/testTXT.txt");
+ InputStream stream =
getResourceAsStream("/test-documents/testTXT.txt");
parser.parse(stream, body, new Metadata(), context);
String content = body.toString();
assertContains("Test d'indexation", content);
@@ -252,8 +249,7 @@ public class ForkParserIntegrationTest extends
MultiThreadedTikaTest {
public void testForkedPDFParsing() throws Exception {
try (ForkParser parser = new
ForkParser(ForkParserIntegrationTest.class.getClassLoader(), tika.getParser()))
{
ContentHandler output = new BodyContentHandler();
- InputStream stream =
ForkParserIntegrationTest.class.getResourceAsStream(
- "/test-documents/testPDF.pdf");
+ InputStream stream =
getResourceAsStream("/test-documents/testPDF.pdf");
ParseContext context = new ParseContext();
context.set(Parser.class, new EmptyParser());
parser.parse(stream, output, new Metadata(), context);
@@ -270,8 +266,7 @@ public class ForkParserIntegrationTest extends
MultiThreadedTikaTest {
public void testForkedPackageParsing() throws Exception {
try (ForkParser parser = new
ForkParser(ForkParserIntegrationTest.class.getClassLoader(), tika.getParser()))
{
ContentHandler output = new BodyContentHandler();
- InputStream stream =
ForkParserIntegrationTest.class.getResourceAsStream(
- "/test-documents/moby.zip");
+ InputStream stream =
getResourceAsStream("/test-documents/moby.zip");
ParseContext context = new ParseContext();
parser.parse(stream, output, new Metadata(), context);
assertContains("Moby Dick", output.toString());
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
index 8732578..41861f7 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -49,7 +49,7 @@ public class HtmlParserTest extends TikaTest {
@Test
public void testDataURIInJS() throws Exception {
- try (InputStream is =
getClass().getResourceAsStream("/org/apache/tika/parser/html/tika-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/html/tika-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
index 54d4915..250934e 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
@@ -91,8 +91,7 @@ public class PDFParserTest extends TikaTest {
//test that it is triggered when added to the default parser
//via the config, tesseract should skip this file because it is too
large
- try (InputStream is =
-
getClass().getResourceAsStream("/org/apache/tika/parser/pdf/tika-xml-profiler-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/pdf/tika-xml-profiler-config.xml"))
{
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
index 8a20d3b..b83f955 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
@@ -35,8 +35,7 @@ public class ArParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofText.ar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testARofText.ar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
@@ -47,8 +46,7 @@ public class ArParserTest extends AbstractPkgTest {
assertContains("Test d'indexation de Txt", content);
assertContains("http://www.apache.org";, content);
- try (InputStream stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofSND.ar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testARofSND.ar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
index 6362b59..480ecd6 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
@@ -35,8 +35,7 @@ public class Bzip2ParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = Bzip2ParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tbz2")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tbz2")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
index 9e75507..21c2d4f 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
@@ -40,7 +40,7 @@ public class CompressParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream =
TarParserTest.class.getResourceAsStream("/test-documents/test-documents.tar.Z"))
{
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tar.Z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
index 1fec770..b45c32a 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
@@ -35,8 +35,7 @@ public class GzipParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = GzipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tgz")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tgz")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
@@ -67,8 +66,7 @@ public class GzipParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = GzipParserTest.class.getResourceAsStream(
- "/test-documents/testSVG.svgz")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testSVG.svgz")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
index 0e003cf..2490649 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
@@ -36,8 +36,7 @@ public class RarParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = RarParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.rar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.rar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
index 180dffd..b56bb2a 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
@@ -78,8 +78,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
// No password, will fail with EncryptedDocumentException
boolean ex = false;
- try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test7Z_protected_passTika.7z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
fail("Shouldn't be able to read a password protected 7z without
the password");
} catch (EncryptedDocumentException e) {
@@ -91,8 +90,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
// No password, will fail with EncryptedDocumentException
ex = false;
- try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/full_encrypted.7z")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/full_encrypted.7z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
fail("Shouldn't be able to read a full password protected 7z
without the password");
} catch (EncryptedDocumentException e) {
@@ -115,8 +113,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
}
});
handler = new BodyContentHandler();
- try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test7Z_protected_passTika.7z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
fail("Shouldn't be able to read a password protected 7z with wrong
password");
} catch (TikaException e) {
@@ -139,8 +136,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
}
});
handler = new BodyContentHandler();
- try (InputStream stream =
Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test7Z_protected_passTika.7z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
@@ -165,8 +161,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
}
});
handler = new BodyContentHandler();
- try (InputStream stream =
Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test7Z_protected_passTika.7z")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test7Z_protected_passTika.7z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
} catch (TikaException e) {
ioe = true;
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
index c3057ea..702a34c 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
@@ -38,8 +38,7 @@ public class TarParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = TarParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
index ba383fd..9294cfb 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
@@ -44,8 +44,7 @@ public class ZipParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.zip")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.zip")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
index 40890f1..dde78a7 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
@@ -34,8 +34,7 @@ public class ZlibParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/testTXT.zlib")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testTXT.zlib")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
recursingContext);
}
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
index c46676b..30f667b 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
@@ -42,7 +42,7 @@ public class PhoneExtractingContentHandlerTest extends
TikaTest {
// The PhoneExtractingContentHandler will examine any characters for
phone numbers before passing them
// to the underlying Handler.
PhoneExtractingContentHandler handler = new
PhoneExtractingContentHandler(new BodyContentHandler(), metadata);
- try (InputStream stream =
PhoneExtractingContentHandlerTest.class.getResourceAsStream("/test-documents/testPhoneNumberExtractor.odt"))
{
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPhoneNumberExtractor.odt")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
String[] phoneNumbers = metadata.getValues("phonenumbers");
diff --git
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
index 3255bc8..04354de 100644
---
a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
+++
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
@@ -39,7 +39,7 @@ public class StandardsExtractingContentHandlerTest extends
TikaTest {
StandardsExtractingContentHandler handler = new
StandardsExtractingContentHandler(new BodyContentHandler(-1), metadata);
handler.setThreshold(0.75);
- InputStream inputStream =
StandardsExtractingContentHandlerTest.class.getResourceAsStream("/test-documents/testStandardsExtractor.pdf");
+ InputStream inputStream =
getResourceAsStream("/test-documents/testStandardsExtractor.pdf");
AUTO_DETECT_PARSER.parse(inputStream, handler, metadata, new
ParseContext());
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
index 03d3bed..b0785e7 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
@@ -50,8 +50,7 @@ public class ExcelParserTest extends TikaTest {
@Test
@SuppressWarnings("deprecation") // Checks legacy Tika-1.0 style metadata
keys
public void testExcelParser() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL.xls")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
@@ -86,8 +85,7 @@ public class ExcelParserTest extends TikaTest {
}
// Request with missing rows
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL.xls")) {
OfficeParserConfig config = new OfficeParserConfig();
config.setIncludeMissingRows(true);
@@ -107,8 +105,7 @@ public class ExcelParserTest extends TikaTest {
@Test
public void testExcelParserFormatting() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL-formats.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL-formats.xls")) {
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -177,8 +174,7 @@ public class ExcelParserTest extends TikaTest {
@Test
public void testExcelParserPassword() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL_protected_passtika.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_protected_passtika.xls")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
@@ -190,8 +186,7 @@ public class ExcelParserTest extends TikaTest {
}
// Try again, this time with the password
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL_protected_passtika.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_protected_passtika.xls")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
@@ -223,8 +218,7 @@ public class ExcelParserTest extends TikaTest {
*/
@Test
public void testExcelParserCharts() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL-charts.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL-charts.xls")) {
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -258,8 +252,7 @@ public class ExcelParserTest extends TikaTest {
@Test
public void testJXL() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/jxl.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/jxl.xls")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
@@ -276,8 +269,7 @@ public class ExcelParserTest extends TikaTest {
@Test
public void testWorksSpreadsheet70() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testWORKSSpreadsheet7.0.xlr")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testWORKSSpreadsheet7.0.xlr")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
@@ -302,7 +294,7 @@ public class ExcelParserTest extends TikaTest {
// First try detection of Excel 5
m = new Metadata();
m.add(TikaCoreProperties.RESOURCE_NAME_KEY, "excel_5.xls");
- try (InputStream input =
ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_5.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_5.xls")) {
type = detector.detect(input, m);
assertEquals("application/vnd.ms-excel", type.toString());
}
@@ -310,7 +302,7 @@ public class ExcelParserTest extends TikaTest {
// Now Excel 95
m = new Metadata();
m.add(TikaCoreProperties.RESOURCE_NAME_KEY, "excel_95.xls");
- try (InputStream input =
ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_95.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_95.xls")) {
type = detector.detect(input, m);
assertEquals("application/vnd.ms-excel", type.toString());
}
@@ -324,7 +316,7 @@ public class ExcelParserTest extends TikaTest {
// Parse the Excel 5 file
m = new Metadata();
- try (InputStream input =
ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_5.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_5.xls")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -351,7 +343,7 @@ public class ExcelParserTest extends TikaTest {
// Parse the Excel 95 file
m = new Metadata();
- try (InputStream input =
ExcelParserTest.class.getResourceAsStream("/test-documents/testEXCEL_95.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_95.xls")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -377,8 +369,7 @@ public class ExcelParserTest extends TikaTest {
public void testCustomProperties() throws Exception {
Metadata metadata = new Metadata();
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL_custom_props.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_custom_props.xls")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -400,8 +391,7 @@ public class ExcelParserTest extends TikaTest {
@Test
public void testHeaderAndFooterExtraction() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL_headers_footers.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_headers_footers.xls")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
@@ -429,8 +419,7 @@ public class ExcelParserTest extends TikaTest {
@Test
public void testHeaderAndFooterNotExtraction() throws Exception {
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL_headers_footers.xls")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL_headers_footers.xls")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
@@ -514,7 +503,7 @@ public class ExcelParserTest extends TikaTest {
assertContainsAtLeast(minExpected,
getRecursiveMetadata("testEXCEL_macro.xls", context));
//test configuring via config file
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-macros.xml")) {
+ try (InputStream is = getResourceAsStream("tika-config-macros.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
assertContainsAtLeast(minExpected,
getRecursiveMetadata("testEXCEL_macro.xls", parser));
@@ -555,7 +544,7 @@ public class ExcelParserTest extends TikaTest {
getXML("testEXCEL_phonetic.xls", pc).xml);
//test configuring via config file
- TikaConfig tikaConfig = new
TikaConfig(OfficeParser.class.getResourceAsStream("tika-config-exclude-phonetic.xml"));
+ TikaConfig tikaConfig = new
TikaConfig(getResourceAsStream("tika-config-exclude-phonetic.xml"));
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
assertNotContained("\u65E5\u672C\u30AA\u30E9\u30AF\u30EB
\u30CB\u30DB\u30F3",
getXML("testEXCEL_phonetic.xls", parser).xml);
@@ -576,7 +565,7 @@ public class ExcelParserTest extends TikaTest {
@Test
public void testDateFormat() throws Exception {
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-custom-date-override.xml")) {
+ try (InputStream is =
getResourceAsStream("tika-config-custom-date-override.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
String xml = getXML("testEXCEL_dateFormats.xls", p).xml;
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
index beffee6..6893340 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
@@ -41,6 +41,6 @@ public class OfficeParserTest extends TikaTest {
}
private InputStream getTestDocument(String name) {
- return
TikaInputStream.get(OOXMLParserTest.class.getResourceAsStream("/test-documents/"
+ name));
+ return TikaInputStream.get(getResourceAsStream("/test-documents/" +
name));
}
}
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
index 3933127..eb54234 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
@@ -55,8 +55,7 @@ public class OutlookParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = OutlookParserTest.class.getResourceAsStream(
- "/test-documents/test-outlook.msg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-outlook.msg")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
assertEquals(
@@ -108,8 +107,7 @@ public class OutlookParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = OutlookParserTest.class.getResourceAsStream(
- "/test-documents/testMSG.msg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testMSG.msg")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
@@ -153,8 +151,7 @@ public class OutlookParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = OutlookParserTest.class.getResourceAsStream(
- "/test-documents/test-outlook2003.msg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-outlook2003.msg")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
assertEquals(
@@ -189,8 +186,7 @@ public class OutlookParserTest extends TikaTest {
handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes");
handler.setResult(new StreamResult(sw));
- try (InputStream stream = OutlookParserTest.class.getResourceAsStream(
- "/test-documents/testMSG_chinese.msg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testMSG_chinese.msg")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
@@ -230,8 +226,7 @@ public class OutlookParserTest extends TikaTest {
handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes");
handler.setResult(new StreamResult(sw));
- try (InputStream stream = OutlookParserTest.class.getResourceAsStream(
- "/test-documents/testMSG_forwarded.msg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testMSG_forwarded.msg")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
@@ -254,8 +249,7 @@ public class OutlookParserTest extends TikaTest {
handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes");
handler.setResult(new StreamResult(sw));
- try (InputStream stream = OutlookParserTest.class.getResourceAsStream(
- "/test-documents/test-outlook2003.msg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-outlook2003.msg")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, new
ParseContext());
}
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
index 4742aae..92ed820 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
@@ -40,8 +40,7 @@ public class PowerPointParserTest extends TikaTest {
@Test
public void testPowerPointParser() throws Exception {
- try (InputStream input =
PowerPointParserTest.class.getResourceAsStream(
- "/test-documents/testPPT.ppt")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testPPT.ppt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -147,8 +146,7 @@ public class PowerPointParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream =
PowerPointParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_masterFooter.ppt")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPPT_masterFooter.ppt")) {
new OfficeParser().parse(stream, handler, metadata, new
ParseContext());
}
@@ -183,8 +181,7 @@ public class PowerPointParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream =
PowerPointParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_masterText.ppt")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPPT_masterText.ppt")) {
new OfficeParser().parse(stream, handler, metadata, new
ParseContext());
}
@@ -212,8 +209,7 @@ public class PowerPointParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream =
PowerPointParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_masterText2.ppt")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPPT_masterText2.ppt")) {
new OfficeParser().parse(stream, handler, metadata, new
ParseContext());
}
@@ -242,8 +238,7 @@ public class PowerPointParserTest extends TikaTest {
public void testCustomProperties() throws Exception {
Metadata metadata = new Metadata();
- try (InputStream input =
PowerPointParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_custom_props.ppt")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testPPT_custom_props.ppt")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
index 63850c3..fbbf94d 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
@@ -36,8 +36,7 @@ public class SolidworksParserTest extends TikaTest {
*/
@Test
public void testPart2013SP2Parser() throws Exception {
- try (InputStream input =
SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksPart2013SP2.SLDPRT")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testsolidworksPart2013SP2.SLDPRT")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -63,8 +62,7 @@ public class SolidworksParserTest extends TikaTest {
*/
@Test
public void testPart2014SP0Parser() throws Exception {
- try (InputStream input =
SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksPart2014SP0.SLDPRT")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testsolidworksPart2014SP0.SLDPRT")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -90,8 +88,7 @@ public class SolidworksParserTest extends TikaTest {
*/
@Test
public void testAssembly2013SP2Parser() throws Exception {
- try (InputStream input =
SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksAssembly2013SP2.SLDASM")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testsolidworksAssembly2013SP2.SLDASM")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -117,8 +114,7 @@ public class SolidworksParserTest extends TikaTest {
*/
@Test
public void testAssembly2014SP0Parser() throws Exception {
- try (InputStream input = SolidworksParserTest.class
-
.getResourceAsStream("/test-documents/testsolidworksAssembly2014SP0.SLDASM")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testsolidworksAssembly2014SP0.SLDASM")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -144,8 +140,7 @@ public class SolidworksParserTest extends TikaTest {
*/
@Test
public void testDrawing2013SP2Parser() throws Exception {
- try (InputStream input =
SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksDrawing2013SP2.SLDDRW")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testsolidworksDrawing2013SP2.SLDDRW")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -171,8 +166,7 @@ public class SolidworksParserTest extends TikaTest {
*/
@Test
public void testDrawing2014SP0Parser() throws Exception {
- try (InputStream input =
SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksDrawing2014SP0.SLDDRW")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testsolidworksDrawing2014SP0.SLDDRW")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
index a3f2bed..c554070 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
@@ -48,8 +48,7 @@ public class WordParserTest extends TikaTest {
@Test
public void testWordParser() throws Exception {
- try (InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD.doc")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testWORD.doc")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -65,8 +64,7 @@ public class WordParserTest extends TikaTest {
@Test
public void testWordWithWAV() throws Exception {
- try (InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/Doc1_ole.doc")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/Doc1_ole.doc")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -177,8 +175,7 @@ public class WordParserTest extends TikaTest {
@Test
public void testWord6Parser() throws Exception {
- try (InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD6.doc")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testWORD6.doc")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new
ParseContext());
@@ -231,8 +228,7 @@ public class WordParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_various.doc")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testWORD_various.doc")) {
new OfficeParser().parse(stream, handler, metadata, new
ParseContext());
}
@@ -313,8 +309,7 @@ public class WordParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_no_format.doc")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testWORD_no_format.doc")) {
new OfficeParser().parse(stream, handler, metadata, new
ParseContext());
}
@@ -329,8 +324,7 @@ public class WordParserTest extends TikaTest {
public void testCustomProperties() throws Exception {
Metadata metadata = new Metadata();
- try (InputStream input = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_custom_props.doc")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testWORD_custom_props.doc")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -597,7 +591,7 @@ public class WordParserTest extends TikaTest {
assertContainsAtLeast(minExpected, metadataList);
//test configuring via config file
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-macros.xml")) {
+ try (InputStream is = getResourceAsStream("tika-config-macros.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
index 2cedd82..43fd11f 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
@@ -68,7 +68,7 @@ public class TestChmExtraction extends MultiThreadedTikaTest {
@Test
public void testChmParser() throws Exception{
for (String fileName : files) {
- InputStream stream =
TestChmExtraction.class.getResourceAsStream(fileName);
+ InputStream stream = getResourceAsStream(fileName);
testingChm(stream);
}
}
@@ -86,7 +86,7 @@ public class TestChmExtraction extends MultiThreadedTikaTest {
@Test
public void testExtractChmEntries() throws TikaException, IOException{
for (String fileName : files) {
- try (InputStream stream =
TestChmExtraction.class.getResourceAsStream(fileName)) {
+ try (InputStream stream = getResourceAsStream(fileName)) {
testExtractChmEntry(stream);
}
}
@@ -171,7 +171,7 @@ public class TestChmExtraction extends
MultiThreadedTikaTest {
for (String fileName : files) {
InputStream stream = null;
try {
- stream =
TestChmExtraction.class.getResourceAsStream(fileName);
+ stream = getResourceAsStream(fileName);
BodyContentHandler handler = new
BodyContentHandler(-1);
parser.parse(stream, handler, new Metadata(), new
ParseContext());
assertTrue(!handler.toString().isEmpty());
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
index 26d2ad5..364ea4b 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
@@ -803,8 +803,7 @@ public class OOXMLParserTest extends TikaTest {
public void testWordCustomProperties() throws Exception {
Metadata metadata = new Metadata();
- try (InputStream input = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_custom_props.docx")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testWORD_custom_props.docx")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -840,8 +839,7 @@ public class OOXMLParserTest extends TikaTest {
public void testPowerPointCustomProperties() throws Exception {
Metadata metadata = new Metadata();
- try (InputStream input = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testPPT_custom_props.pptx")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testPPT_custom_props.pptx")) {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext context = new ParseContext();
context.set(Locale.class, Locale.US);
@@ -877,8 +875,7 @@ public class OOXMLParserTest extends TikaTest {
handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "no");
handler.setResult(new StreamResult(sw));
- try (InputStream input = OOXMLParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_embedded_pdf.docx")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testWORD_embedded_pdf.docx")) {
new OOXMLParser().parse(input, handler, metadata, new
ParseContext());
}
String xml = sw.toString();
@@ -931,8 +928,7 @@ public class OOXMLParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = WordParserTest.class.getResourceAsStream(
- "/test-documents/testWORD_no_format.docx")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testWORD_no_format.docx")) {
new OOXMLParser().parse(stream, handler, metadata, new
ParseContext());
}
@@ -1348,7 +1344,7 @@ public class OOXMLParserTest extends TikaTest {
assertContainsAtLeast(minExpected,
getRecursiveMetadata("testWORD_macros.docm", context));
//test configuring via config file
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-dom-macros.xml")) {
+ try (InputStream is =
getResourceAsStream("tika-config-dom-macros.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
assertContainsAtLeast(minExpected,
getRecursiveMetadata("testWORD_macros.docm", parser));
@@ -1381,7 +1377,7 @@ public class OOXMLParserTest extends TikaTest {
assertContainsAtLeast(minExpected,
getRecursiveMetadata("testPPT_macros.pptm", context));
//test configuring via config file
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-dom-macros.xml")) {
+ try (InputStream is =
getResourceAsStream("tika-config-dom-macros.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
assertContainsAtLeast(minExpected,
getRecursiveMetadata("testPPT_macros.pptm", parser));
@@ -1415,7 +1411,7 @@ public class OOXMLParserTest extends TikaTest {
getRecursiveMetadata("testEXCEL_macro.xlsm", context));
//test configuring via config file
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-dom-macros.xml")) {
+ try (InputStream is =
getResourceAsStream("tika-config-dom-macros.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
assertContainsAtLeast(minExpected,
getRecursiveMetadata("testEXCEL_macro.xlsm", parser));
@@ -1453,8 +1449,7 @@ public class OOXMLParserTest extends TikaTest {
//NOTE: this test relies on a bug in the DOM extractor that
//is passing over the title information.
//once we fix that, this test will no longer be meaningful!
- try (InputStream is =
-
getClass().getResourceAsStream("/org/apache/tika/parser/microsoft/tika-config-sax-docx.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/microsoft/tika-config-sax-docx.xml"))
{
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser p = new AutoDetectParser(tikaConfig);
@@ -1472,8 +1467,7 @@ public class OOXMLParserTest extends TikaTest {
// Should be detected correctly
MediaType type;
- try (InputStream input = ExcelParserTest.class.getResourceAsStream(
- "/test-documents/testEXCEL.xlsb")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testEXCEL.xlsb")) {
type = detector.detect(input, m);
assertEquals("application/vnd.ms-excel.sheet.binary.macroenabled.12",
type.toString());
}
@@ -1754,7 +1748,7 @@ public class OOXMLParserTest extends TikaTest {
@Test
public void testDateFormat() throws Exception {
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-custom-date-override.xml")) {
+ try (InputStream is =
getResourceAsStream("tika-config-custom-date-override.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
String xml = getXML("testEXCEL_dateFormats.xlsx", p).xml;
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
index c368e8a..3c2ca38 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
@@ -569,7 +569,7 @@ public class SXSLFExtractorTest extends TikaTest {
assertContainsAtLeast(parsedBy, metadataList);
//test configuring via config file
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-sax-macros.xml")) {
+ try (InputStream is =
getResourceAsStream("tika-config-sax-macros.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
metadataList = getRecursiveMetadata("testPPT_macros.pptm", parser);
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
index bcff5ad..cd0e9a3 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
@@ -737,7 +737,7 @@ public class SXWPFExtractorTest extends TikaTest {
assertContainsAtLeast(parsedBy, metadataList);
//test configuring via config file
- try (InputStream is =
this.getClass().getResourceAsStream("tika-config-sax-macros.xml")) {
+ try (InputStream is =
getResourceAsStream("tika-config-sax-macros.xml")) {
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser parser = new AutoDetectParser(tikaConfig);
metadataList = getRecursiveMetadata("testWORD_macros.docm",
parser);
diff --git
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
index fde70b1..b96c3ee 100644
---
a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
+++
b/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
@@ -334,7 +334,7 @@ public class RTFParserTest extends TikaTest {
@Test
public void testTurningOffList() throws Exception {
- try (InputStream is = getClass().getResourceAsStream(
+ try (InputStream is = getResourceAsStream(
"/org/apache/tika/parser/microsoft/rtf/ignoreListMarkup-tika-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
@@ -446,8 +446,7 @@ public class RTFParserTest extends TikaTest {
//test that memory allocation of the bin element is limited
//via the config file. Unfortunately, this test file's bin embedding
contains 10 bytes
//so we had to set the config to 0.
- try (InputStream is =
-
getClass().getResourceAsStream("/org/apache/tika/parser/microsoft/rtf/tika-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/microsoft/rtf/tika-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
diff --git
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
index 9aa1268..b729e6f 100644
---
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
+++
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
@@ -36,8 +36,7 @@ public class DIFParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = DIFParser.class.getResourceAsStream(
- "/test-documents/Zamora2010.dif")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/Zamora2010.dif")) {
parser.parse(stream, handler, metadata, new ParseContext());
}
diff --git
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
index a317b53..77f3fbe 100644
---
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
+++
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
@@ -81,7 +81,7 @@ public class EpubParserTest extends TikaTest {
assert(tocIndex < ch2);
assert(ch1 < ch2);
- try (InputStream is =
getClass().getResourceAsStream("/org/apache/tika/parser/epub/tika-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/epub/tika-config.xml")) {
assertNotNull(is);
Parser p = new AutoDetectParser(new TikaConfig(is));
xml = getXML("testEPUB.epub", p).xml;
diff --git
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
index 54eed2b..d0385f9 100644
---
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
+++
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
@@ -61,8 +61,7 @@ public class ODFParserTest extends TikaTest {
@Test
public void testOO3() throws Exception {
for (Parser parser : getParsers()) {
- try (InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testODFwithOOo3.odt")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testODFwithOOo3.odt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
parser.parse(input, handler, metadata, new ParseContext());
@@ -84,8 +83,7 @@ public class ODFParserTest extends TikaTest {
@Test
public void testOO2() throws Exception {
for (Parser parser : getParsers()) {
- try (InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testOpenOffice2.odt")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testOpenOffice2.odt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
parser.parse(input, handler, metadata, new ParseContext());
@@ -132,8 +130,7 @@ public class ODFParserTest extends TikaTest {
*/
@Test
public void testOO2Metadata() throws Exception {
- try (InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testOpenOffice2.odf")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testOpenOffice2.odf")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new OpenDocumentParser().parse(input, handler, metadata);
@@ -189,8 +186,7 @@ public class ODFParserTest extends TikaTest {
*/
@Test
public void testOO3Metadata() throws Exception {
- try (InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testODFwithOOo3.odt")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testODFwithOOo3.odt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new OpenDocumentParser().parse(input, handler, metadata);
@@ -238,8 +234,7 @@ public class ODFParserTest extends TikaTest {
@Test
public void testODPMasterFooter() throws Exception {
- try (InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testMasterFooter.odp")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testMasterFooter.odp")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
AUTO_DETECT_PARSER.parse(input, handler, metadata, new
ParseContext());
@@ -251,8 +246,7 @@ public class ODFParserTest extends TikaTest {
@Test
public void testODTFooter() throws Exception {
- try (InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testFooter.odt")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testFooter.odt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
AUTO_DETECT_PARSER.parse(input, handler, metadata, new
ParseContext());
@@ -266,8 +260,7 @@ public class ODFParserTest extends TikaTest {
@Test
public void testODSFooter() throws Exception {
- try (InputStream input = ODFParserTest.class.getResourceAsStream(
- "/test-documents/testFooter.ods")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testFooter.ods")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
AUTO_DETECT_PARSER.parse(input, handler, metadata, new
ParseContext());
@@ -330,7 +323,7 @@ public class ODFParserTest extends TikaTest {
@Test
public void testNullStylesInODTFooter() throws Exception {
Parser parser = new OpenDocumentParser();
- try (InputStream input =
ODFParserTest.class.getResourceAsStream("/test-documents/testODT-TIKA-6000.odt"))
{
+ try (InputStream input =
getResourceAsStream("/test-documents/testODT-TIKA-6000.odt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
parser.parse(input, handler, metadata,
getNonRecursingParseContext());
diff --git
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
index d9d3ab2..318987b 100644
---
a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
+++
b/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
@@ -70,7 +70,7 @@ public class WordPerfectTest extends TikaTest {
assertContains("this was deleted.", xml);
- try (InputStream is =
getClass().getResourceAsStream("/org/apache/tika/parser/wordperfect/tika-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/wordperfect/tika-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
diff --git
a/tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
b/tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
index 246c24a..f34ade2 100644
---
a/tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
+++
b/tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
@@ -53,8 +53,7 @@ public class TesseractOCRConfigTest extends TikaTest {
@Test
public void testPartialConfig() throws Exception {
- InputStream stream = TesseractOCRConfigTest.class.getResourceAsStream(
- "/test-properties/TesseractOCRConfig-partial.properties");
+ InputStream stream =
getResourceAsStream("/test-properties/TesseractOCRConfig-partial.properties");
TesseractOCRConfig config = new TesseractOCRConfig(stream);
assertEquals("Invalid default tesseractPath value", "",
config.getTesseractPath());
@@ -75,8 +74,7 @@ public class TesseractOCRConfigTest extends TikaTest {
@Test
public void testFullConfig() throws Exception {
- InputStream stream = TesseractOCRConfigTest.class.getResourceAsStream(
- "/test-properties/TesseractOCRConfig-full.properties");
+ InputStream stream =
getResourceAsStream("/test-properties/TesseractOCRConfig-full.properties");
TesseractOCRConfig config = new TesseractOCRConfig(stream);
if(SystemUtils.IS_OS_UNIX) {
diff --git
a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
b/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
index 0bdb249..fbc898f 100644
---
a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
+++
b/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
@@ -240,8 +240,7 @@ public class PDFParserTest extends TikaTest {
boolean ex = false;
ContentHandler handler = new BodyContentHandler();
metadata = new Metadata();
- try (InputStream stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDF_protected.pdf")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPDF_protected.pdf")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata, context);
} catch (EncryptedDocumentException e) {
ex = true;
@@ -257,8 +256,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testTwoTextBoxes() throws Exception {
String content;
- try(InputStream stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDFTwoTextBoxes.pdf")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPDFTwoTextBoxes.pdf")) {
content = getText(stream, AUTO_DETECT_PARSER);
}
content = content.replaceAll("\\s+", " ");
@@ -269,8 +267,7 @@ public class PDFParserTest extends TikaTest {
public void testVarious() throws Exception {
Metadata metadata = new Metadata();
String content;
- try(InputStream stream = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDFVarious.pdf")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testPDFVarious.pdf")) {
content = getText(stream, AUTO_DETECT_PARSER, metadata);
}
//content = content.replaceAll("\\s+"," ");
@@ -629,8 +626,7 @@ public class PDFParserTest extends TikaTest {
Metadata m = new Metadata();
ParseContext c = new ParseContext();
ContentHandler h = new EventCountingHandler();
- try(InputStream is = PDFParserTest.class.getResourceAsStream(
- "/test-documents/testPDFTripleLangTitle.pdf")) {
+ try (InputStream is =
getResourceAsStream("/test-documents/testPDFTripleLangTitle.pdf")) {
AUTO_DETECT_PARSER.parse(is, h, m, c);
}
assertEquals(1, ((EventCountingHandler) h).getEndDocument());
@@ -1181,7 +1177,7 @@ public class PDFParserTest extends TikaTest {
assumeTrue("can run OCR", canRunOCR());
//via the config, tesseract should skip this file because it is too
large
- try (InputStream is =
getClass().getResourceAsStream("/org/apache/tika/parser/pdf/tika-ocr-config.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/pdf/tika-ocr-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
@@ -1199,7 +1195,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testInitializationViaConfig() throws Exception {
- try (InputStream is =
getClass().getResourceAsStream("/org/apache/tika/parser/pdf/tika-config.xml")) {
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/pdf/tika-config.xml")) {
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
Parser p = new AutoDetectParser(tikaConfig);
@@ -1213,8 +1209,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testInitializationOfNonPrimitivesViaConfig() throws Exception {
- try (InputStream is =
-
getClass().getResourceAsStream("/org/apache/tika/parser/pdf/tika-config-non-primitives.xml"))
{
+ try (InputStream is =
getResourceAsStream("/org/apache/tika/parser/pdf/tika-config-non-primitives.xml"))
{
assertNotNull(is);
TikaConfig tikaConfig = new TikaConfig(is);
AutoDetectParser p = new AutoDetectParser(tikaConfig);
@@ -1245,7 +1240,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testConfiguringMoreParams() throws Exception {
- try (InputStream configIs =
getClass().getResourceAsStream("/org/apache/tika/parser/pdf/tika-inline-config.xml"))
{
+ try (InputStream configIs =
getResourceAsStream("/org/apache/tika/parser/pdf/tika-inline-config.xml")) {
assertNotNull(configIs);
TikaConfig tikaConfig = new TikaConfig(configIs);
AutoDetectParser p = new AutoDetectParser(tikaConfig);
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
index 579540c..8a6e46c 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
@@ -40,8 +40,7 @@ public class ArParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofText.ar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testARofText.ar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
@@ -62,8 +61,7 @@ public class ArParserTest extends AbstractPkgTest {
}
tracker.reset();
- try (InputStream stream = ArParserTest.class.getResourceAsStream(
- "/test-documents/testARofSND.ar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testARofSND.ar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
index 14da361..6eda94a 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
@@ -40,8 +40,7 @@ public class Bzip2ParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tbz2")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tbz2")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
index 04aba66..a08fa08 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
@@ -42,7 +42,7 @@ public class CompressParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream =
ZipParserTest.class.getResourceAsStream("/test-documents/test-documents.tar.Z"))
{
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tar.Z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
index c8ace4e..c4295d2 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
@@ -40,8 +40,7 @@ public class GzipParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tgz")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tgz")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
index 340679c..0f99167 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
@@ -47,8 +47,7 @@ public class RarParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = RarParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.rar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.rar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
@@ -101,8 +100,7 @@ public class RarParserTest extends AbstractPkgTest {
public void testEncryptedRar() throws Exception {
Parser parser = new RarParser();
- try (InputStream input = RarParserTest.class.getResourceAsStream(
- "/test-documents/test-documents-enc.rar")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/test-documents-enc.rar")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
ParseContext context = new ParseContext();
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
index e893092..1b73ce7 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
@@ -50,8 +50,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = Seven7ParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.7z")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.7z")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
index 286538d..fbfb926 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
@@ -42,8 +42,7 @@ public class TarParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.tar")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.tar")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
index 0990ecd..9dd5ce0 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
@@ -48,8 +48,7 @@ public class ZipParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.zip")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/test-documents.zip")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
@@ -91,9 +90,7 @@ public class ZipParserTest extends AbstractPkgTest {
*/
@Test
public void testUnsupportedZipCompressionMethod() throws Exception {
- String content = new Tika().parseToString(
- ZipParserTest.class.getResourceAsStream(
- "/test-documents/moby.zip"));
+ String content = new
Tika().parseToString(getResourceAsStream("/test-documents/moby.zip"));
assertContains("README", content);
}
@@ -140,8 +137,7 @@ public class ZipParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/testZip_with_DataDescriptor.zip")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testZip_with_DataDescriptor.zip")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
assertEquals(5, tracker.filenames.size());
diff --git
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
index 30e3868..4480eed 100644
---
a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
+++
b/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
@@ -39,8 +39,7 @@ public class ZlibParserTest extends AbstractPkgTest {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- try (InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/testTXT.zlib")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testTXT.zlib")) {
AUTO_DETECT_PARSER.parse(stream, handler, metadata,
trackingContext);
}
diff --git
a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
b/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
index 0c7e4e0..8474e53 100644
---
a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
+++
b/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
@@ -236,7 +236,7 @@ public class TXTParserTest extends TikaTest {
Metadata metadata = new Metadata();
StringWriter writer = new StringWriter();
parser.parse(
-
TXTParserTest.class.getResourceAsStream("/test-documents/russian.cp866.txt"),
+ getResourceAsStream("/test-documents/russian.cp866.txt"),
new WriteOutContentHandler(writer),
metadata,
new ParseContext());
@@ -249,7 +249,7 @@ public class TXTParserTest extends TikaTest {
Metadata metadata = new Metadata();
StringWriter writer = new StringWriter();
parser.parse(
-
TXTParserTest.class.getResourceAsStream("/test-documents/english.cp500.txt"),
+ getResourceAsStream("/test-documents/english.cp500.txt"),
new WriteOutContentHandler(writer),
metadata,
new ParseContext());
diff --git
a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
b/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
index d5e231b..58e1d73 100644
---
a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
+++
b/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
@@ -31,7 +31,7 @@ public class XLIFF12ParserTest extends TikaTest {
@Test
public void testXLIFF12() throws Exception {
- try (InputStream input =
XLIFF12ParserTest.class.getResourceAsStream("/test-documents/testXLIFF12.xlf"))
{
+ try (InputStream input =
getResourceAsStream("/test-documents/testXLIFF12.xlf")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new XLIFF12Parser().parse(input, handler, metadata, new
ParseContext());
diff --git
a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
b/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
index b58659e..61377a4 100644
---
a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
+++
b/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
@@ -34,8 +34,7 @@ public class DcXMLParserTest extends TikaTest {
@Test
public void testXMLParserAsciiChars() throws Exception {
- try (InputStream input = DcXMLParserTest.class.getResourceAsStream(
- "/test-documents/testXML.xml")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testXML.xml")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new DcXMLParser().parse(input, handler, metadata);
@@ -76,7 +75,7 @@ public class DcXMLParserTest extends TikaTest {
@Test
public void testXMLParserNonAsciiChars() throws Exception {
- try (InputStream input =
DcXMLParserTest.class.getResourceAsStream("/test-documents/testXML.xml")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testXML.xml")) {
Metadata metadata = new Metadata();
new DcXMLParser().parse(input, new DefaultHandler(), metadata);
diff --git
a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
b/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
index 54b1fec..247b999 100644
---
a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
+++
b/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
@@ -39,8 +39,7 @@ public class EmptyAndDuplicateElementsXMLParserTest extends
TikaTest {
@Test
public void testDefaultBehavior() throws Exception {
- try (InputStream input =
EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
- "/test-documents/testXML3.xml")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testXML3.xml")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new DefaultCustomXMLTestParser().parse(input, handler, metadata,
new ParseContext());
@@ -64,8 +63,7 @@ public class EmptyAndDuplicateElementsXMLParserTest extends
TikaTest {
@Test
public void testEmptiesAndRepeats() throws Exception {
- try (InputStream input =
EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
- "/test-documents/testXML3.xml")) {
+ try (InputStream input =
getResourceAsStream("/test-documents/testXML3.xml")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new AllowEmptiesAndDuplicatesCustomXMLTestParser().parse(input,
handler, metadata, new ParseContext());
diff --git
a/tika-parser-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
b/tika-parser-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
index 37b7b25..df9745b 100644
---
a/tika-parser-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
+++
b/tika-parser-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
@@ -36,7 +36,7 @@ public class JempboxExtractorTest extends TikaTest {
@Test
public void testParseJpeg() throws IOException, TikaException {
Metadata metadata = new Metadata();
- try (InputStream stream =
getClass().getResourceAsStream("/test-documents/testJPEG_commented.jpg")) {
+ try (InputStream stream =
getResourceAsStream("/test-documents/testJPEG_commented.jpg")) {
// set some values before extraction to see that they are
overridden
metadata.set(TikaCoreProperties.TITLE, "old title");
metadata.set(TikaCoreProperties.DESCRIPTION, "old description");
@@ -63,8 +63,7 @@ public class JempboxExtractorTest extends TikaTest {
@Test
public void testParseJpegPhotoshop() throws IOException, TikaException {
Metadata metadata = new Metadata();
- try (InputStream stream =
-
getClass().getResourceAsStream("/test-documents/testJPEG_commented_pspcs2mac.jpg"))
{
+ try (InputStream stream =
getResourceAsStream("/test-documents/testJPEG_commented_pspcs2mac.jpg")) {
JempboxExtractor extractor = new JempboxExtractor(metadata);
extractor.parse(stream);
@@ -81,8 +80,7 @@ public class JempboxExtractorTest extends TikaTest {
@Test
public void testParseJpegXnviewmp() throws IOException, TikaException {
Metadata metadata = new Metadata();
- try (InputStream stream =
-
getClass().getResourceAsStream("/test-documents/testJPEG_commented_xnviewmp026.jpg"))
{
+ try (InputStream stream =
getResourceAsStream("/test-documents/testJPEG_commented_xnviewmp026.jpg")) {
JempboxExtractor extractor = new JempboxExtractor(metadata);
extractor.parse(stream);
diff --git
a/tika-parsers-advanced/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
b/tika-parsers-advanced/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
index 9f878ac..f4f1e96 100644
---
a/tika-parsers-advanced/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
+++
b/tika-parsers-advanced/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
@@ -59,7 +59,7 @@ public class AgeRecogniserTest extends TikaTest {
public void testAgeRecogniser() throws Exception {
//test config is added to resources directory
- try (InputStream is = getClass().getResourceAsStream(CONFIG_FILE);
+ try (InputStream is = getResourceAsStream(CONFIG_FILE);
InputStream bis = new
ByteArrayInputStream(TEST_TEXT.getBytes(Charset.defaultCharset()));
) {
TikaConfig config = new TikaConfig(is);
diff --git
a/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
index d5adde0..a7aef2f 100644
---
a/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
+++
b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
@@ -43,7 +43,7 @@ public class NamedEntityParserTest extends TikaTest {
public void testParse() throws Exception {
//test config is added to resources directory
- try (InputStream is = getClass().getResourceAsStream(CONFIG_FILE)) {
+ try (InputStream is = getResourceAsStream(CONFIG_FILE)) {
TikaConfig config = new TikaConfig(is);
Tika tika = new Tika(config);
String text = "I am student at University of Southern California
(USC)," +
@@ -78,7 +78,7 @@ public class NamedEntityParserTest extends TikaTest {
public void testNerChain() throws Exception {
String classNames = OpenNLPNERecogniser.class.getName() + "," +
RegexNERecogniser.class.getName();
System.setProperty(NamedEntityParser.SYS_PROP_NER_IMPL, classNames);
- try (InputStream is = getClass().getResourceAsStream(CONFIG_FILE)) {
+ try (InputStream is = getResourceAsStream(CONFIG_FILE)) {
TikaConfig config = new TikaConfig(is);
Tika tika = new Tika(config);
String text = "University of Southern California (USC), is located
in Los Angeles ." +
