You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/07/27 21:44:37 UTC
[tika] 03/03: TIKA-3501 migrate tika-parsers to junit5
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 6f4365b9ef03ac99de21f10a6e3f2a98452c5007
Author: tallison <ta...@apache.org>
AuthorDate: Tue Jul 27 17:44:07 2021 -0400
TIKA-3501 migrate tika-parsers to junit5
---
tika-app/pom.xml | 6 +-
tika-batch/pom.xml | 24 +-
tika-bundles/tika-bundle-standard/pom.xml | 9 +-
tika-eval/tika-eval-app/pom.xml | 5 -
tika-eval/tika-eval-core/pom.xml | 5 -
tika-example/pom.xml | 6 +-
tika-fuzzing/pom.xml | 6 +-
tika-integration-tests/pom.xml | 5 -
.../pom.xml | 4 +
.../tika-pipes-solr-integration-tests/pom.xml | 4 +
tika-java7/pom.xml | 5 -
tika-langdetect/pom.xml | 5 -
tika-parent/pom.xml | 34 ++-
tika-parsers/pom.xml | 23 ++
tika-parsers/tika-parsers-extended/pom.xml | 24 +-
.../tika/parser/envi/EnviHeaderParserTest.java | 16 +-
.../apache/tika/parser/gdal/TestGDALParser.java | 14 +-
.../geoinfo/GeographicInformationParserTest.java | 4 +-
.../apache/tika/parser/grib/GribParserTest.java | 8 +-
.../org/apache/tika/parser/hdf/HDFParserTest.java | 8 +-
.../tika/parser/isatab/ISArchiveParserTest.java | 31 +-
.../tika/parser/netcdf/NetCDFParserTest.java | 6 +-
.../tika/parser/sqlite3/SQLite3ParserTest.java | 2 +-
.../apache/tika/mime/TestMimeTypesExtended.java | 12 +-
.../tika/parser/sqlite3/SQLite3ParserTest.java | 5 +-
.../tika-parsers-ml/tika-age-recogniser/pom.xml | 12 -
.../tika/parser/recognition/AgeRecogniserTest.java | 15 +-
tika-parsers/tika-parsers-ml/tika-dl/pom.xml | 5 -
.../tika/dl/imagerec/DL4JInceptionV3NetTest.java | 10 +-
.../apache/tika/dl/imagerec/DL4JVGG16NetTest.java | 10 +-
.../tika-parser-advancedmedia-module/pom.xml | 12 -
.../recognition/ObjectRecognitionParserTest.java | 29 +-
.../tf/TensorflowImageRecParserTest.java | 13 +-
.../tf/TensorflowVideoRecParserTest.java | 13 +-
.../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 12 +-
.../org/apache/tika/parser/geo/GeoParserTest.java | 8 +-
.../tika/parser/journal/JournalParserTest.java | 8 +-
.../org/apache/tika/parser/journal/TEITest.java | 6 +-
.../tika/parser/ner/NamedEntityParserTest.java | 4 +-
.../tika/parser/ner/nltk/NLTKNERecogniserTest.java | 5 +-
.../parser/ner/regex/RegexNERecogniserTest.java | 4 +-
.../sentiment/SentimentAnalysisParserTest.java | 6 +-
.../tika-parsers-ml/tika-transcribe-aws/pom.xml | 318 ++++++++++-----------
.../transcribe/aws/AmazonTranscribeTest.java | 10 +-
.../tika-parsers-standard-modules/pom.xml | 13 -
.../apache/tika/parser/apple/PListParserTest.java | 4 +-
.../tika/parser/iwork/AutoPageNumberUtilsTest.java | 4 +-
.../apache/tika/parser/iwork/IWorkParserTest.java | 80 +++---
.../tika/parser/iwork/iwana/IWork13ParserTest.java | 8 +-
.../apache/tika/parser/audio/AudioParserTest.java | 4 +-
.../apache/tika/parser/audio/MidiParserTest.java | 5 +-
.../org/apache/tika/parser/mp3/Mp3ParserTest.java | 13 +-
.../org/apache/tika/parser/mp3/MpegStreamTest.java | 28 +-
.../org/apache/tika/parser/mp4/MP4ParserTest.java | 8 +-
.../apache/tika/parser/video/FLVParserTest.java | 4 +-
.../org/apache/tika/parser/dwg/DWGParserTest.java | 6 +-
.../org/apache/tika/parser/prt/PRTParserTest.java | 4 +-
.../apache/tika/parser/asm/ClassParserTest.java | 6 +-
.../tika/parser/code/SourceCodeParserTest.java | 8 +-
.../parser/executable/ExecutableParserTest.java | 4 +-
.../org/apache/tika/parser/mat/MatParserTest.java | 5 +-
.../apache/tika/parser/sas/SAS7BDATParserTest.java | 4 +-
.../apache/tika/parser/crypto/Pkcs7ParserTest.java | 4 +-
.../apache/tika/parser/crypto/TSDParserTest.java | 6 +-
.../apache/tika/parser/font/FontParsersTest.java | 5 +-
.../tika/parser/html/DataURISchemeParserTest.java | 10 +-
.../tika/parser/html/HtmlEncodingDetectorTest.java | 23 +-
.../apache/tika/parser/html/HtmlParserTest.java | 66 ++---
.../html/StandardHtmlEncodingDetectorTest.java | 14 +-
.../apache/tika/parser/image/HeifParserTest.java | 4 +-
.../apache/tika/parser/image/ICNSParserTest.java | 3 +-
.../parser/image/ImageMetadataExtractorTest.java | 27 +-
.../apache/tika/parser/image/ImageParserTest.java | 4 +-
.../apache/tika/parser/image/JpegParserTest.java | 48 ++--
.../apache/tika/parser/image/PSDParserTest.java | 11 +-
.../apache/tika/parser/image/WebPParserTest.java | 4 +-
.../tika/parser/mailcommons/MailUtilTest.java | 13 +-
.../apache/tika/parser/mail/RFC822ParserTest.java | 26 +-
.../apache/tika/parser/mbox/MboxParserTest.java | 16 +-
.../AbstractPOIContainerExtractionTest.java | 6 +-
.../tika/parser/microsoft/EMFParserTest.java | 4 +-
.../tika/parser/microsoft/ExcelParserTest.java | 10 +-
.../tika/parser/microsoft/JackcessParserTest.java | 20 +-
.../parser/microsoft/MSOwnerFileParserTest.java | 5 +-
.../tika/parser/microsoft/OfficeParserTest.java | 4 +-
.../tika/parser/microsoft/OldExcelParserTest.java | 8 +-
.../tika/parser/microsoft/OutlookParserTest.java | 14 +-
.../microsoft/POIContainerExtractionTest.java | 10 +-
.../parser/microsoft/PowerPointParserTest.java | 21 +-
.../tika/parser/microsoft/ProjectParserTest.java | 4 +-
.../tika/parser/microsoft/PublisherParserTest.java | 4 +-
.../parser/microsoft/SolidworksParserTest.java | 4 +-
.../tika/parser/microsoft/TNEFParserTest.java | 4 +-
.../tika/parser/microsoft/VisioParserTest.java | 4 +-
.../tika/parser/microsoft/WMFParserTest.java | 5 +-
.../tika/parser/microsoft/WordParserTest.java | 26 +-
.../parser/microsoft/WriteProtectedParserTest.java | 2 +-
.../parser/microsoft/chm/TestChmBlockInfo.java | 12 +-
.../parser/microsoft/chm/TestChmExtraction.java | 15 +-
.../parser/microsoft/chm/TestChmExtractor.java | 16 +-
.../parser/microsoft/chm/TestChmItsfHeader.java | 16 +-
.../parser/microsoft/chm/TestChmItspHeader.java | 14 +-
.../tika/parser/microsoft/chm/TestChmLzxState.java | 10 +-
.../microsoft/chm/TestChmLzxcControlData.java | 12 +-
.../microsoft/chm/TestChmLzxcResetTable.java | 10 +-
.../microsoft/chm/TestDirectoryListingEntry.java | 10 +-
.../tika/parser/microsoft/chm/TestPmgiHeader.java | 10 +-
.../tika/parser/microsoft/chm/TestPmglHeader.java | 10 +-
.../microsoft/onenote/OneNoteParserTest.java | 38 +--
.../ooxml/OOXMLContainerExtractionTest.java | 14 +-
.../parser/microsoft/ooxml/OOXMLParserTest.java | 91 +++---
.../parser/microsoft/ooxml/SXSLFExtractorTest.java | 54 ++--
.../parser/microsoft/ooxml/SXWPFExtractorTest.java | 31 +-
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 10 +-
.../parser/microsoft/ooxml/xps/XPSParserTest.java | 4 +-
.../ooxml/xwpf/ml2006/Word2006MLParserTest.java | 12 +-
.../parser/microsoft/pst/OutlookPSTParserTest.java | 10 +-
.../tika/parser/microsoft/rtf/RTFParserTest.java | 12 +-
.../parser/microsoft/xml/XML2003ParserTest.java | 12 +-
.../org/apache/tika/parser/dbf/DBFParserTest.java | 6 +-
.../org/apache/tika/parser/dif/DIFParserTest.java | 4 +-
.../apache/tika/parser/epub/EpubParserTest.java | 6 +-
.../apache/tika/parser/hwp/HwpV5ParserTest.java | 4 +-
.../tika/parser/ibooks/iBooksParserTest.java | 4 +-
.../org/apache/tika/parser/mif/MIFParserTest.java | 4 +-
.../org/apache/tika/parser/odf/ODFParserTest.java | 33 ++-
.../tika/parser/wordperfect/QuattroProTest.java | 4 +-
.../tika/parser/wordperfect/WPInputStreamTest.java | 4 +-
.../tika/parser/wordperfect/WordPerfectTest.java | 6 +-
.../apache/tika/parser/feed/FeedParserTest.java | 11 +-
.../tika/parser/ocr/TesseractOCRConfigTest.java | 166 ++++++-----
.../tika/parser/ocr/TesseractOCRParserTest.java | 31 +-
.../apache/tika/parser/pdf/AccessCheckerTest.java | 26 +-
.../parser/pdf/PDFMarkedContent2XHTMLTest.java | 8 +-
.../org/apache/tika/parser/pdf/PDFParserTest.java | 69 +++--
.../apache/tika/parser/pkg/AbstractPkgTest.java | 4 +-
.../org/apache/tika/parser/pkg/ArParserTest.java | 12 +-
.../apache/tika/parser/pkg/Bzip2ParserTest.java | 4 +-
.../apache/tika/parser/pkg/CompressParserTest.java | 6 +-
.../tika/parser/pkg/CompressorParserTest.java | 21 +-
.../org/apache/tika/parser/pkg/GzipParserTest.java | 4 +-
.../apache/tika/parser/pkg/PackageParserTest.java | 13 +-
.../org/apache/tika/parser/pkg/RarParserTest.java | 14 +-
.../apache/tika/parser/pkg/Seven7ParserTest.java | 12 +-
.../org/apache/tika/parser/pkg/TarParserTest.java | 12 +-
.../org/apache/tika/parser/pkg/ZipParserTest.java | 27 +-
.../org/apache/tika/parser/pkg/ZlibParserTest.java | 4 +-
.../org/apache/tika/parser/csv/CSVSnifferTest.java | 4 +-
.../tika/parser/csv/TextAndCSVParserTest.java | 12 +-
.../parser/strings/Latin1StringsParserTest.java | 4 +-
.../tika/parser/strings/StringsConfigTest.java | 35 +--
.../tika/parser/strings/StringsParserTest.java | 8 +-
.../tika/parser/txt/CharsetDetectorTest.java | 6 +-
.../org/apache/tika/parser/txt/TXTParserTest.java | 8 +-
.../tika/parser/xliff/XLIFF12ParserTest.java | 4 +-
.../apache/tika/parser/xliff/XLZParserTest.java | 4 +-
.../apache/tika/parser/xml/DcXMLParserTest.java | 8 +-
.../EmptyAndDuplicateElementsXMLParserTest.java | 4 +-
.../tika/parser/xml/FictionBookParserTest.java | 2 +-
.../parser/xml/TextAndAttributeXMLParserTest.java | 6 +-
.../tika/parser/xmp/JempboxExtractorTest.java | 6 +-
.../org/apache/tika/detect/zip/ZipParserTest.java | 4 +-
.../tika-parsers-standard-package/pom.xml | 5 -
.../apache/tika/config/TikaDetectorConfigTest.java | 23 +-
.../tika/config/TikaEncodingDetectorTest.java | 30 +-
.../apache/tika/config/TikaParserConfigTest.java | 13 +-
.../tika/config/TikaTranslatorConfigTest.java | 19 +-
.../tika/detect/TestContainerAwareDetector.java | 20 +-
.../apache/tika/detect/TestDetectorLoading.java | 4 +-
.../tika/detect/TestFileCommandDetector.java | 4 +-
.../tika/extractor/EmbeddedDocumentUtilTest.java | 2 +-
.../java/org/apache/tika/mime/MimeTypeTest.java | 12 +-
.../java/org/apache/tika/mime/MimeTypesTest.java | 18 +-
.../java/org/apache/tika/mime/TestMimeTypes.java | 20 +-
.../apache/tika/parser/AutoDetectParserTest.java | 40 +--
.../tika/parser/AutoDetectReaderParserTest.java | 5 +-
.../parser/BouncyCastleDigestingParserTest.java | 36 ++-
.../apache/tika/parser/DigestingParserTest.java | 29 +-
.../org/apache/tika/parser/ParsingReaderTest.java | 4 +-
.../tika/parser/RecursiveParserWrapperTest.java | 14 +-
.../org/apache/tika/parser/TabularFormatsTest.java | 23 +-
.../java/org/apache/tika/parser/TestParsers.java | 35 +--
.../apache/tika/parser/TestXMLEntityExpansion.java | 19 +-
.../java/org/apache/tika/parser/TestXXEInXML.java | 8 +-
.../parser/apple/AppleSingleFileParserTest.java | 5 +-
.../apache/tika/parser/apple/PListParserTest.java | 5 +-
.../apache/tika/parser/crypto/TSDParserTest.java | 7 +-
.../parser/fork/ForkParserIntegrationTest.java | 12 +-
.../apache/tika/parser/html/HtmlParserTest.java | 7 +-
.../apache/tika/parser/mail/MboxParserTest.java | 8 +-
.../apache/tika/parser/mail/RFC822ParserTest.java | 14 +-
.../tika/parser/microsoft/EMFParserTest.java | 4 +-
.../tika/parser/microsoft/ExcelParserTest.java | 2 +-
.../microsoft/POIContainerExtractionTest.java | 6 +-
.../parser/microsoft/PowerPointParserTest.java | 5 +-
.../tika/parser/microsoft/XML2003ParserTest.java | 5 +-
.../parser/microsoft/ooxml/OOXMLParserTest.java | 8 +-
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 4 +-
.../tika/parser/microsoft/rtf/RTFParserTest.java | 14 +-
.../apache/tika/parser/mock/MockParserTest.java | 18 +-
.../tika/parser/ocr/TesseractOCRParserTest.java | 20 +-
.../org/apache/tika/parser/odf/ODFParserTest.java | 8 +-
.../org/apache/tika/parser/pdf/PDFParserTest.java | 48 ++--
.../org/apache/tika/parser/pkg/ArParserTest.java | 4 +-
.../apache/tika/parser/pkg/Bzip2ParserTest.java | 4 +-
.../pkg/CompositeZipContainerDetectorTest.java | 10 +-
.../apache/tika/parser/pkg/CompressParserTest.java | 14 +-
.../tika/parser/pkg/CompressorParserTest.java | 5 +-
.../org/apache/tika/parser/pkg/GzipParserTest.java | 4 +-
.../apache/tika/parser/pkg/PackageParserTest.java | 2 +-
.../org/apache/tika/parser/pkg/RarParserTest.java | 4 +-
.../apache/tika/parser/pkg/Seven7ParserTest.java | 20 +-
.../org/apache/tika/parser/pkg/TarParserTest.java | 4 +-
.../org/apache/tika/parser/pkg/ZipParserTest.java | 8 +-
.../org/apache/tika/parser/pkg/ZlibParserTest.java | 5 +-
.../tika/parser/xml/FictionBookParserTest.java | 5 +-
.../sax/PhoneExtractingContentHandlerTest.java | 3 +-
.../sax/StandardsExtractingContentHandlerTest.java | 4 +-
.../apache/tika/utils/ServiceLoaderUtilsTest.java | 7 +-
.../tika-emitters/tika-emitter-opensearch/pom.xml | 5 -
tika-pipes/tika-emitters/tika-emitter-s3/pom.xml | 6 +-
tika-pipes/tika-emitters/tika-emitter-solr/pom.xml | 5 -
tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml | 5 -
tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml | 5 -
.../tika-pipes-iterator-csv/pom.xml | 5 -
.../tika-pipes-iterator-jdbc/pom.xml | 5 -
.../tika-pipes-iterator-s3/pom.xml | 5 -
.../tika-pipes-iterator-solr/pom.xml | 5 -
tika-serialization/pom.xml | 5 -
tika-server/tika-server-client/pom.xml | 5 -
tika-server/tika-server-core/pom.xml | 6 +-
tika-translate/pom.xml | 12 +-
tika-xmp/pom.xml | 4 -
233 files changed, 1603 insertions(+), 1636 deletions(-)
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 2284528..a6cf171 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -84,11 +84,7 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml
index e996f5b..bfc1008 100644
--- a/tika-batch/pom.xml
+++ b/tika-batch/pom.xml
@@ -64,16 +64,28 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml
index 71ac1bf..c9225b0 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -61,11 +61,6 @@
<!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${pax.exam.version}</version>
@@ -79,6 +74,10 @@
<groupId>org.ops4j.base</groupId>
<artifactId>ops4j-base-lang</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/tika-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml
index 7644d4f..b5f6675 100644
--- a/tika-eval/tika-eval-app/pom.xml
+++ b/tika-eval/tika-eval-app/pom.xml
@@ -99,11 +99,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-eval/tika-eval-core/pom.xml b/tika-eval/tika-eval-core/pom.xml
index 2b20855..b47bf70 100644
--- a/tika-eval/tika-eval-core/pom.xml
+++ b/tika-eval/tika-eval-core/pom.xml
@@ -99,11 +99,6 @@
<version>${lucene.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index df91648..5a6e90a 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -160,11 +160,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<description>This module contains examples of how to use Apache Tika.</description>
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index 1b5245b..ee5d28f 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -70,11 +70,7 @@
<artifactId>tika-parser-digest-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
<!-- bring in the mock parser -->
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tika-integration-tests/pom.xml b/tika-integration-tests/pom.xml
index 215c033..6caba1d 100644
--- a/tika-integration-tests/pom.xml
+++ b/tika-integration-tests/pom.xml
@@ -55,10 +55,5 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
index 4c0eb0a..4c7f5f9 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
@@ -47,6 +47,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
index 0c751f2..5a4ca7c 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
@@ -47,6 +47,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/tika-java7/pom.xml b/tika-java7/pom.xml
index 3dd3bfc..dbd6b71 100644
--- a/tika-java7/pom.xml
+++ b/tika-java7/pom.xml
@@ -91,11 +91,6 @@
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<description>Java-7 reliant components, including FileTypeDetector implementations</description>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index 901cdef..903a6fd 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 69951e1..12fd55f 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -323,6 +323,7 @@
<jna.version>5.8.0</jna.version>
<joda.time.version>2.10.10</joda.time.version>
<json.simple.version>1.1.1</json.simple.version>
+ <junit5.version>5.8.0-M1</junit5.version>
<juniversalchardet.version>1.0.3</juniversalchardet.version>
<junrar.version>7.4.0</junrar.version>
<libpst.version>0.9.3</libpst.version>
@@ -366,6 +367,27 @@
<zstd.version>1.5.0-2</zstd.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
@@ -379,12 +401,6 @@
<version>1.12.0</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -448,11 +464,7 @@
<configuration>
<fail>false</fail>
<excludeCoordinates>
- <coordinate>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- </coordinate>
+<!-- <coordinate> </coordinate> -->
</excludeCoordinates>
</configuration>
<executions>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 0a8257c..058500b 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -40,6 +40,29 @@
<module>tika-parsers-ml</module>
</modules>
+ <dependencies>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/tika-parsers/tika-parsers-extended/pom.xml b/tika-parsers/tika-parsers-extended/pom.xml
index fbbf299..0b373e0 100644
--- a/tika-parsers/tika-parsers-extended/pom.xml
+++ b/tika-parsers/tika-parsers-extended/pom.xml
@@ -30,6 +30,12 @@
<packaging>pom</packaging>
<name>Apache Tika extended parsers</name>
+ <modules>
+ <module>tika-parser-sqlite3-module</module>
+ <module>tika-parser-scientific-module</module>
+ <module>tika-parsers-extended-integration-tests</module>
+ </modules>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -37,25 +43,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
- <modules>
- <module>tika-parser-sqlite3-module</module>
- <module>tika-parser-scientific-module</module>
- <module>tika-parsers-extended-integration-tests</module>
- </modules>
<build>
<pluginManagement>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
index 562badc..06b8285 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
@@ -18,16 +18,16 @@
package org.apache.tika.parser.envi;
import static org.apache.tika.TikaTest.assertContains;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ParseContext;
@@ -43,14 +43,14 @@ public class EnviHeaderParserTest {
private ToXMLContentHandler handler;
private Metadata metadata;
- @Before
+ @BeforeEach
public void setUp() {
setParser(new EnviHeaderParser());
setHandler(new ToXMLContentHandler());
setMetadata(new Metadata());
}
- @After
+ @AfterEach
public void tearDown() {
setParser(null);
setHandler(null);
@@ -62,7 +62,7 @@ public class EnviHeaderParserTest {
try (InputStream stream = EnviHeaderParser.class
.getResourceAsStream("/test-documents/envi_test_header.hdr")) {
- assertNotNull("Test ENVI file 'envi_test_header.hdr' not found", stream);
+ assertNotNull(stream, "Test ENVI file 'envi_test_header.hdr' not found");
parser.parse(stream, handler, metadata, new ParseContext());
}
@@ -93,7 +93,7 @@ public class EnviHeaderParserTest {
try (InputStream stream = EnviHeaderParser.class
.getResourceAsStream("/test-documents/ang20150420t182050_corr_v1e_img.hdr")) {
- assertNotNull("Test ENVI file 'ang20150420t182050_corr_v1e_img.hdr' not found", stream);
+ assertNotNull(stream, "Test ENVI file 'ang20150420t182050_corr_v1e_img.hdr' not found");
parser.parse(stream, handler, metadata, new ParseContext());
}
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
index 2b42649..557d11b 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
@@ -17,17 +17,15 @@
package org.apache.tika.parser.gdal;
-//JDK imports
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java
index 59f5ed0..8a46330 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.parser.geoinfo;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java
index 34969b5..7875809 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java
@@ -17,14 +17,12 @@
package org.apache.tika.parser.grib;
-//JDK imports
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java
index 0bca1e3..3aaea28 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java
@@ -16,14 +16,12 @@
*/
package org.apache.tika.parser.hdf;
-//JDK imports
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java
index 2e1e296..08f9308 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.isatab;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
@@ -48,22 +48,23 @@ public class ISArchiveParserTest {
}
// INVESTIGATION
- assertEquals("Invalid Investigation Identifier", "BII-I-1",
- metadata.get("Investigation Identifier"));
- assertEquals("Invalid Investigation Title",
- "Growth control of the eukaryote cell: a systems biology study in yeast",
- metadata.get("Investigation Title"));
+ assertEquals("BII-I-1", metadata.get("Investigation Identifier"),
+ "Invalid Investigation Identifier");
+ assertEquals("Growth control of the eukaryote cell: a systems biology study in yeast",
+ metadata.get("Investigation Title"),
+ "Invalid Investigation Title");
// INVESTIGATION PUBLICATIONS
- assertEquals("Invalid Investigation PubMed ID", "17439666",
- metadata.get("Investigation PubMed ID"));
- assertEquals("Invalid Investigation Publication DOI", "doi:10.1186/jbiol54",
- metadata.get("Investigation Publication DOI"));
+ assertEquals("17439666", metadata.get("Investigation PubMed ID"),
+ "Invalid Investigation PubMed ID");
+ assertEquals("doi:10.1186/jbiol54",
+ metadata.get("Investigation Publication DOI"),
+ "Invalid Investigation Publication DOI");
// INVESTIGATION CONTACTS
- assertEquals("Invalid Investigation Person Last Name", "Oliver",
- metadata.get("Investigation Person Last Name"));
- assertEquals("Invalid Investigation Person First Name", "Stephen",
- metadata.get("Investigation Person First Name"));
+ assertEquals( "Oliver", metadata.get("Investigation Person Last Name"),
+ "Invalid Investigation Person Last Name");
+ assertEquals("Stephen", metadata.get("Investigation Person First Name"),
+ "Invalid Investigation Person First Name");
}
}
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
index 91b0eda..92dc073 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
@@ -16,14 +16,12 @@
*/
package org.apache.tika.parser.netcdf;
-//JDK imports
-
import static org.apache.tika.TikaTest.assertContains;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
index 3730dd6..6b8e500 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
@@ -19,7 +19,7 @@ package org.apache.tika.parser.sqlite3;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypesExtended.java b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypesExtended.java
index 024a478..88c3e3f 100644
--- a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypesExtended.java
+++ b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypesExtended.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.mime;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import java.io.InputStream;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.io.TikaInputStream;
@@ -33,7 +33,7 @@ public class TestMimeTypesExtended {
MimeTypes repo;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
TikaConfig config = TikaConfig.getDefaultConfig();
repo = config.getMimeRepository();
@@ -47,7 +47,7 @@ public class TestMimeTypesExtended {
private void assertTypeByData(String expected, String filename) throws IOException {
try (InputStream stream = TikaInputStream.get(TestMimeTypesExtended.class
.getResourceAsStream("/test-documents/" + filename))) {
- assertNotNull("Test file not found: " + filename, stream);
+ assertNotNull(stream, "Test file not found: " + filename);
Metadata metadata = new Metadata();
assertEquals(expected, repo.detect(stream, metadata).toString());
}
diff --git a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
index 37b7be8..c9be6db 100644
--- a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
+++ b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
@@ -17,7 +17,7 @@
package org.apache.tika.parser.sqlite3;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -47,6 +47,7 @@ import org.apache.tika.sax.RecursiveParserWrapperHandler;
import org.apache.tika.sax.ToXMLContentHandler;
public class SQLite3ParserTest extends TikaTest {
+
private final static String TEST_FILE_NAME = "testSqlite3b.db";
private final static String TEST_FILE1 = "/test-documents/" + TEST_FILE_NAME;
diff --git a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
index 48e51dc..609ce68 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -201,13 +201,6 @@
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
@@ -218,11 +211,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tika-parsers/tika-parsers-ml/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java b/tika-parsers/tika-parsers-ml/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
index d6657fe..6b8883e 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.recognition;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -24,8 +25,7 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import edu.usc.irds.agepredictor.authorage.AgePredicterLocal;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.TikaTest;
@@ -71,13 +71,14 @@ public class AgeRecogniserTest extends TikaTest {
Metadata md = new Metadata();
tika.parse(bis, md);
- Assert.assertArrayEquals("Age Parser not invoked.",
- new String[]{CompositeParser.class.getCanonicalName(),
+ assertArrayEquals(new String[]{CompositeParser.class.getCanonicalName(),
AgeRecogniser.class.getCanonicalName()},
- md.getValues(TikaCoreProperties.TIKA_PARSED_BY));
- Assert.assertArrayEquals("Wrong age predicted.",
+ md.getValues(TikaCoreProperties.TIKA_PARSED_BY),
+ "Age Parser not invoked.");
+ assertArrayEquals(
new String[]{Double.toString(TEST_AGE)},
- md.getValues(AgeRecogniser.MD_KEY_ESTIMATED_AGE));
+ md.getValues(AgeRecogniser.MD_KEY_ESTIMATED_AGE),
+ "Wrong age predicted.");
}
}
diff --git a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
index 0d89b6f..f94c0b0 100644
--- a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
@@ -38,11 +38,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.deeplearning4j</groupId>
<artifactId>deeplearning4j-zoo</artifactId>
<version>${dl4j.version}</version>
diff --git a/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java b/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
index 41daa85..2111ab7 100644
--- a/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.dl.imagerec;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
@@ -37,11 +37,11 @@ public class DL4JInceptionV3NetTest {
} catch (Exception e) {
if (e.getMessage() != null && (e.getMessage().contains("Connection refused") ||
e.getMessage().contains("connect timed out"))) {
- assumeTrue("skipping test because of connection issue", false);
+ assumeTrue(false, "skipping test because of connection issue");
}
throw e;
}
- assumeTrue("something went wrong loading tika config", config != null);
+ assumeTrue(config != null, "something went wrong loading tika config");
Tika tika = new Tika(config);
Metadata md = new Metadata();
try (InputStream is = getClass().getResourceAsStream("cat.jpg")) {
diff --git a/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java b/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
index ed98d64..36b5aac 100644
--- a/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.dl.imagerec;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
@@ -37,12 +37,12 @@ public class DL4JVGG16NetTest {
} catch (Exception e) {
if (e.getMessage() != null && (e.getMessage().contains("Connection refused") ||
e.getMessage().contains("connect timed out"))) {
- assumeTrue("skipping test because of connection issue", false);
+ assumeTrue(false, "skipping test because of connection issue");
}
throw e;
}
- assumeTrue("something went wrong loading tika config", config != null);
+ assumeTrue(false, "something went wrong loading tika config");
Tika tika = new Tika(config);
Metadata md = new Metadata();
try (InputStream is = getClass().getResourceAsStream("lion.jpg")) {
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
index 947f115..9fcda7f 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml
@@ -117,17 +117,5 @@
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
index f9d43df..272a0da 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.tika.parser.recognition;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -24,9 +27,7 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
@@ -66,7 +67,7 @@ public class ObjectRecognitionParserTest {
@Test
public void jpegTFObjRecTest() throws IOException, TikaException, SAXException {
TensorflowImageRecParser p = new TensorflowImageRecParser();
- Assume.assumeTrue(p.isAvailable());
+ assumeTrue(p.isAvailable());
try (InputStream stream = loader.getResourceAsStream(CONFIG_FILE_OBJ_REC)) {
assert stream != null;
Tika tika = new Tika(new TikaConfig(stream));
@@ -80,8 +81,8 @@ public class ObjectRecognitionParserTest {
.join(metadata.getValues(ObjectRecognitionParser.MD_KEY_OBJ_REC), " ");
for (String expectedObject : expectedObjects) {
String message = "'" + expectedObject + "' must have been detected";
- Assert.assertTrue(message, text.contains(expectedObject));
- Assert.assertTrue(message, metaValues.contains(expectedObject));
+ assertTrue(text.contains(expectedObject), message);
+ assertTrue(metaValues.contains(expectedObject), message);
}
}
}
@@ -97,7 +98,7 @@ public class ObjectRecognitionParserTest {
available = status == 200;
} catch (Exception ignore) {
}
- Assume.assumeTrue(available);
+ assumeTrue(available);
String[] expectedObjects = {"Egyptian cat", "tabby, tabby cat"};
doRecognize(CONFIG_REST_FILE_OBJ_REC, CAT_IMAGE_JPEG,
ObjectRecognitionParser.MD_KEY_OBJ_REC, expectedObjects);
@@ -113,7 +114,7 @@ public class ObjectRecognitionParserTest {
available = status == 200;
} catch (Exception ignore) {
}
- Assume.assumeTrue(available);
+ assumeTrue(available);
String[] expectedObjects = {"Egyptian cat", "tabby, tabby cat"};
doRecognize(CONFIG_REST_FILE_OBJ_REC, CAT_IMAGE_PNG, ObjectRecognitionParser.MD_KEY_OBJ_REC,
expectedObjects);
@@ -129,7 +130,7 @@ public class ObjectRecognitionParserTest {
available = status == 200;
} catch (Exception ignore) {
}
- Assume.assumeTrue(available);
+ assumeTrue(available);
String[] expectedObjects = {"Egyptian cat"};
doRecognize(CONFIG_REST_FILE_OBJ_REC, CAT_IMAGE_GIF, ObjectRecognitionParser.MD_KEY_OBJ_REC,
expectedObjects);
@@ -145,7 +146,7 @@ public class ObjectRecognitionParserTest {
available = status == 200;
} catch (Exception ignore) {
}
- Assume.assumeTrue(available);
+ assumeTrue(available);
String[] expectedCaption = {"a baseball player holding a bat on a field"};
doRecognize(CONFIG_REST_FILE_IM2TXT, BASEBALL_IMAGE_JPEG,
ObjectRecognitionParser.MD_KEY_IMG_CAP, expectedCaption);
@@ -161,7 +162,7 @@ public class ObjectRecognitionParserTest {
available = status == 200;
} catch (Exception ignore) {
}
- Assume.assumeTrue(available);
+ assumeTrue(available);
String[] expectedCaption = {"a baseball player holding a bat on a field"};
doRecognize(CONFIG_REST_FILE_IM2TXT, BASEBALL_IMAGE_PNG,
ObjectRecognitionParser.MD_KEY_IMG_CAP, expectedCaption);
@@ -177,7 +178,7 @@ public class ObjectRecognitionParserTest {
available = status == 200;
} catch (Exception ignore) {
}
- Assume.assumeTrue(available);
+ assumeTrue(available);
String[] expectedCaption = {"a baseball player pitching a ball on top of a field"};
doRecognize(CONFIG_REST_FILE_IM2TXT, BASEBALL_IMAGE_GIF,
ObjectRecognitionParser.MD_KEY_IMG_CAP, expectedCaption);
@@ -196,8 +197,8 @@ public class ObjectRecognitionParserTest {
LOG.info("MetaValues = {}", metaValues);
for (String expectedObject : expectedObjects) {
String message = "'" + expectedObject + "' must have been detected";
- Assert.assertTrue(message, text.contains(expectedObject));
- Assert.assertTrue(message, metaValues.contains(expectedObject));
+ assertTrue(text.contains(expectedObject), message);
+ assertTrue(metaValues.contains(expectedObject), message);
}
}
}
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
index 513a8a7..28e5b6f 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
@@ -17,15 +17,16 @@
package org.apache.tika.parser.recognition.tf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.InputStream;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.metadata.Metadata;
@@ -33,7 +34,7 @@ import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.recognition.RecognisedObject;
-@Ignore
+@Disabled
public class TensorflowImageRecParserTest {
@Test
@@ -44,7 +45,7 @@ public class TensorflowImageRecParserTest {
.getResourceAsStream("test-documents/testJPEG.jpg")) {
List<RecognisedObject> objects = recogniser
.recognise(stream, new DefaultHandler(), new Metadata(), new ParseContext());
- Assert.assertTrue(5 == objects.size());
+ assertTrue(5 == objects.size());
Set<String> objectLabels = new HashSet<>();
for (RecognisedObject object : objects) {
objectLabels.add(object.getLabel());
@@ -52,7 +53,7 @@ public class TensorflowImageRecParserTest {
System.out.println(objectLabels);
String[] expected = {"Egyptian cat", "tabby, tabby cat"};
for (String label : expected) {
- Assert.assertTrue(label + " is expected", objectLabels.contains(label));
+ assertTrue(objectLabels.contains(label), label + " is expected");
}
}
}
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
index 9bdff78..c77f9f7 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
@@ -17,15 +17,16 @@
package org.apache.tika.parser.recognition.tf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.InputStream;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.metadata.Metadata;
@@ -33,7 +34,7 @@ import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.recognition.RecognisedObject;
-@Ignore
+@Disabled
public class TensorflowVideoRecParserTest {
@Test
@@ -45,12 +46,12 @@ public class TensorflowVideoRecParserTest {
List<RecognisedObject> objects = recogniser
.recognise(stream, new DefaultHandler(), new Metadata(), new ParseContext());
- Assert.assertTrue(objects.size() > 0);
+ assertTrue(objects.size() > 0);
Set<String> objectLabels = new HashSet<>();
for (RecognisedObject object : objects) {
objectLabels.add(object.getLabel());
}
- Assert.assertTrue(objectLabels.size() > 0);
+ assertTrue(objectLabels.size() > 0);
}
}
}
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
index 1083ce3..7127ddb 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
@@ -43,6 +43,10 @@
<scope>provided</scope>
<exclusions>
<exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -278,14 +282,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
index cd7eead..733ef29 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
@@ -18,16 +18,16 @@
package org.apache.tika.parser.geo;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
index 4d45899..aabe657 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
@@ -18,13 +18,13 @@
package org.apache.tika.parser.journal;
import static org.apache.tika.parser.journal.GrobidRESTParser.canRun;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
index e60de7d..e79a13e 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
@@ -17,15 +17,15 @@
package org.apache.tika.parser.journal;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
index 021f568..fcaaa06 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.parser.ner;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -24,7 +24,7 @@ import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.HashSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
index a71c873..ae9ee39 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.parser.ner.nltk;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
@@ -32,6 +32,7 @@ import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ner.NamedEntityParser;
public class NLTKNERecogniserTest {
+
@Test
public void testGetEntityTypes() throws Exception {
String text = "America is a big country.";
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
index a9619cd..e6610de 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.parser.ner.regex;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
index 6d9df04..91d3a52 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.parser.sentiment;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.apache.tika.Tika;
diff --git a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
index de27f35..d5bd941 100644
--- a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml
@@ -19,169 +19,163 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>tika-parsers-ml</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.0.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <artifactId>tika-parsers-ml</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.1-SNAPSHOT</version>
+ </parent>
- <artifactId>tika-transcribe-aws</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Tika transcribe aws</name>
- <url>http://tika.apache.org/</url>
- <!--TODO use latest aws version or the one defined in the tika-parent-->
- <dependencies>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-transcribe</artifactId>
- <version>${aws.transcribe.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- <version>${aws.s3.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>${json.simple.version}</version>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Bundle-Activator>
- org.apache.tika.parser.internal.Activator
- </Bundle-Activator>
- <Import-Package>
- org.w3c.dom,
- org.apache.tika.*,
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/main/java/org/apache/tika/parser/txt/Charset*.java</exclude>
- <exclude>src/test/resources/test-documents/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.parser.transcribe.aws</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <artifactId>tika-transcribe-aws</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Tika transcribe aws</name>
+ <url>http://tika.apache.org/</url>
+ <!--TODO use latest aws version or the one defined in the tika-parent-->
+ <dependencies>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-transcribe</artifactId>
+ <version>${aws.transcribe.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ <version>${aws.s3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json.simple.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Bundle-Activator>
+ org.apache.tika.parser.internal.Activator
+ </Bundle-Activator>
+ <Import-Package>
+ org.w3c.dom,
+ org.apache.tika.*,
+ *;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>src/main/java/org/apache/tika/parser/txt/Charset*.java</exclude>
+ <exclude>src/test/resources/test-documents/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.transcribe.aws</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
- <pluginManagement>
- <plugins>
- <!-- This plugin's configuration is used to store Eclipse m2e -->
- <!-- settings only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <version>${maven.scr.version}</version>
- <goals>
- <goal>scr</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <pluginManagement>
+ <plugins>
+ <!-- This plugin's configuration is used to store Eclipse m2e -->
+ <!-- settings only. It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>${maven.scr.version}</version>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
diff --git a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/src/test/java/org/apache/tika/parser/transcribe/aws/AmazonTranscribeTest.java b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/src/test/java/org/apache/tika/parser/transcribe/aws/AmazonTranscribeTest.java
index be4f76a..dfb48a0 100644
--- a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/src/test/java/org/apache/tika/parser/transcribe/aws/AmazonTranscribeTest.java
+++ b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/src/test/java/org/apache/tika/parser/transcribe/aws/AmazonTranscribeTest.java
@@ -19,9 +19,9 @@ package org.apache.tika.parser.transcribe.aws;
import java.io.InputStream;
import com.amazonaws.services.transcribe.model.LanguageCode;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -35,12 +35,12 @@ import org.apache.tika.parser.Parser;
* 1) Tests that transcribe functions properly when it is given just a filepath.
* 2) Both audio (mp3) and video (mp4) files are used in these tests.
*/
-@Ignore("Ignore until finalize AmazonTrancsribe Interface & build Tika")
+@Disabled("Ignore until finalize AmazonTrancsribe Interface & build Tika")
public class AmazonTranscribeTest extends TikaTest {
static Parser PARSER;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
try (InputStream is = AmazonTranscribeTest.class
.getResourceAsStream("tika-config-aws-transcribe.xml")) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml
index d60e9aa..c79118e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml
@@ -42,19 +42,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
<modules>
<module>tika-parser-html-commons</module>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
index 35733cb..420f90e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.apple;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java
index 283249c..f01c1bc 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.iwork;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for the <code>AutoPageNumberUtils</code> helper class.
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
index 3695cca..9f23083 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.parser.iwork;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -40,7 +40,7 @@ public class IWorkParserTest extends TikaTest {
private IWorkPackageParser iWorkParser;
- @Before
+ @BeforeEach
public void setUp() {
iWorkParser = new IWorkPackageParser();
}
@@ -66,18 +66,18 @@ public class IWorkParserTest extends TikaTest {
// Make sure enough keys came through
// (Exact numbers will vary based on composites)
- assertTrue("Insufficient metadata found " + metadata.size(), metadata.size() >= 6);
+ assertTrue(metadata.size() >= 6, "Insufficient metadata found " + metadata.size());
List<String> metadataKeys = Arrays.asList(metadata.names());
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(Metadata.CONTENT_TYPE));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(Office.SLIDE_COUNT.getName()));
+ assertTrue(metadataKeys.contains(Metadata.CONTENT_TYPE),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(Office.SLIDE_COUNT.getName()),
+ "Metadata not found in " + metadataKeys);
// assertTrue("Metadata not found in " + metadataKeys,
// metadataKeys.contains(Office.SLIDE_COUNT.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.CREATOR.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.TITLE.getName()));
+ assertTrue(metadataKeys.contains(TikaCoreProperties.CREATOR.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.TITLE.getName()),
+ "Metadata not found in " + metadataKeys);
// Check the metadata values
assertEquals("application/vnd.apple.keynote", metadata.get(Metadata.CONTENT_TYPE));
@@ -145,20 +145,20 @@ public class IWorkParserTest extends TikaTest {
String content = getText("testPages.pages", iWorkParser, metadata);
// Make sure enough keys came through
// (Exact numbers will vary based on composites)
- assertTrue("Insufficient metadata found " + metadata.size(), metadata.size() >= 50);
+ assertTrue(metadata.size() >= 50, "Insufficient metadata found " + metadata.size());
List<String> metadataKeys = Arrays.asList(metadata.names());
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(Metadata.CONTENT_TYPE));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(Office.PAGE_COUNT.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.CREATOR.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.TITLE.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.MODIFIED.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.LANGUAGE.getName()));
+ assertTrue(metadataKeys.contains(Metadata.CONTENT_TYPE),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(Office.PAGE_COUNT.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.CREATOR.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.TITLE.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.MODIFIED.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.LANGUAGE.getName()),
+ "Metadata not found in " + metadataKeys);
// Check the metadata values
assertEquals("application/vnd.apple.pages", metadata.get(Metadata.CONTENT_TYPE));
@@ -206,20 +206,20 @@ public class IWorkParserTest extends TikaTest {
// Make sure enough keys came through
// (Exact numbers will vary based on composites)
- assertTrue("Insufficient metadata found " + metadata.size(), metadata.size() >= 8);
+ assertTrue(metadata.size() >= 8, "Insufficient metadata found " + metadata.size());
List<String> metadataKeys = Arrays.asList(metadata.names());
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(Metadata.CONTENT_TYPE));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(Office.PAGE_COUNT.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.CREATOR.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.COMMENTS.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.TITLE.getName()));
- assertTrue("Metadata not found in " + metadataKeys,
- metadataKeys.contains(TikaCoreProperties.TITLE.getName()));
+ assertTrue(metadataKeys.contains(Metadata.CONTENT_TYPE),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(Office.PAGE_COUNT.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.CREATOR.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.COMMENTS.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.TITLE.getName()),
+ "Metadata not found in " + metadataKeys);
+ assertTrue(metadataKeys.contains(TikaCoreProperties.TITLE.getName()),
+ "Metadata not found in " + metadataKeys);
// Check the metadata values
assertEquals("2", metadata.get(Office.PAGE_COUNT));
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
index 93b1f28..99be2cd 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.iwork.iwana;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -38,7 +38,7 @@ public class IWork13ParserTest extends TikaTest {
private IWork13PackageParser iWorkParser;
private ParseContext parseContext;
- @Before
+ @BeforeEach
public void setUp() {
iWorkParser = new IWork13PackageParser();
parseContext = new ParseContext();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java
index 40e90b8..12f7533 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.audio;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
index 3066722..c1c00d8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
@@ -17,16 +17,13 @@
package org.apache.tika.parser.audio;
import static org.apache.tika.TikaTest.assertContains;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.tika.Tika;
import org.apache.tika.metadata.Metadata;
public class MidiParserTest {
- @Test
public void testMID() throws Exception {
String path = "/test-documents/testMID.mid";
Metadata metadata = new Metadata();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
index 9bbeec5..7f54bd2 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.mp3;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.ByteArrayInputStream;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -40,8 +40,9 @@ public class Mp3ParserTest extends TikaTest {
* @param expected the expected duration, rounded as seconds
*/
private static void checkDuration(Metadata metadata, int expected) {
- assertEquals("Wrong duration", expected,
- Math.round(Float.parseFloat(metadata.get(XMPDM.DURATION))));
+ assertEquals(expected,
+ Math.round(Float.parseFloat(metadata.get(XMPDM.DURATION))),
+ "wrong duration");
}
/**
@@ -308,7 +309,7 @@ public class Mp3ParserTest extends TikaTest {
*/
@Test
public void testTIKA424() throws Exception {
- Assume.assumeTrue(
+ assumeTrue(
Mp3ParserTest.class.getResourceAsStream("/test-documents/test2.mp3") != null);
Metadata metadata = new Metadata();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
index e8ce8b7..bb408fc 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
@@ -17,18 +17,18 @@
package org.apache.tika.parser.mp3;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
/**
* Test class for {@code MpegStream}.
@@ -69,7 +69,7 @@ public class MpegStreamTest {
out.write(b4);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (stream != null) {
stream.close();
@@ -86,11 +86,11 @@ public class MpegStreamTest {
ByteArrayInputStream in = new ByteArrayInputStream(bos.toByteArray());
stream = new MpegStream(in);
AudioFrame header = stream.nextFrame();
- assertNotNull("No header found", header);
- assertEquals("Wrong MPEG version", AudioFrame.MPEG_V2, header.getVersionCode());
- assertEquals("Wrong layer", AudioFrame.LAYER_3, header.getLayer());
- assertEquals("Wrong bit rate", 80000, header.getBitRate());
- assertEquals("Wrong sample rate", 24000, header.getSampleRate());
+ assertNotNull(header, "No header found");
+ assertEquals(AudioFrame.MPEG_V2, header.getVersionCode(), "Wrong MPEG version");
+ assertEquals(AudioFrame.LAYER_3, header.getLayer(), "Wrong layer");
+ assertEquals(80000, header.getBitRate(), "Wrong bit rate");
+ assertEquals(24000, header.getSampleRate(), "Wrong sample rate");
}
/**
@@ -136,7 +136,7 @@ public class MpegStreamTest {
bos.write(0x96);
ByteArrayInputStream in = new ByteArrayInputStream(bos.toByteArray());
stream = new MpegStream(in);
- assertNull("Got a frame", stream.nextFrame());
+ assertNull(stream.nextFrame(), "Got a frame");
}
/**
@@ -148,6 +148,6 @@ public class MpegStreamTest {
bos.write("This is a test".getBytes(UTF_8));
ByteArrayInputStream in = new ByteArrayInputStream(bos.toByteArray());
stream = new MpegStream(in);
- assertFalse("Wrong result", stream.skipFrame());
+ assertFalse(stream.skipFrame(), "Wrong result");
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
index b060696..951c595 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.tika.parser.mp4;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -120,7 +121,8 @@ public class MP4ParserTest extends TikaTest {
// TODO Test a MP4 Video file
// TODO Test an old QuickTime Video File
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void testInfiniteLoop() throws Exception {
XMLResult r = getXML("testMP4_truncated.m4a");
assertEquals("audio/mp4", r.metadata.get(Metadata.CONTENT_TYPE));
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java
index e09f018..2259f8a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.video;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
index f3a5412..f28019f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
@@ -17,13 +17,13 @@
package org.apache.tika.parser.dwg;
import static org.apache.tika.TikaTest.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.InputStream;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
index 0a2db65..c235163 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.prt;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java
index f255199..6a2b024 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.asm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
index 287d1a5..45758f8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
@@ -17,14 +17,14 @@
package org.apache.tika.parser.code;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
index 2d43a50..7912936 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.executable;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
index 7ffa739..6cba023 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.mat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -32,6 +32,7 @@ import org.apache.tika.sax.ToXMLContentHandler;
* Test cases to exercise the {@link MatParser}.
*/
public class MatParserTest extends TikaTest {
+
@Test
public void testParser() throws Exception {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
index 34c7cc4..697decb 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.sas;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
import java.text.DateFormatSymbols;
import java.util.Arrays;
import java.util.Locale;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
index ef76cc0..42761d3 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.parser.crypto;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
index 127d65c..2789ef1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.crypto;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
index fcf03bd..9481519 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
@@ -23,9 +23,9 @@ import static org.apache.tika.parser.font.AdobeFontMetricParser.MET_FONT_SUB_FAM
import static org.apache.tika.parser.font.AdobeFontMetricParser.MET_FONT_VERSION;
import static org.apache.tika.parser.font.AdobeFontMetricParser.MET_FONT_WEIGHT;
import static org.apache.tika.parser.font.AdobeFontMetricParser.MET_PS_NAME;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -39,6 +39,7 @@ import org.apache.tika.sax.BodyContentHandler;
* Test case for parsing various different font files.
*/
public class FontParsersTest extends TikaTest {
+
@Test
public void testAdobeFontMetricParsing() throws Exception {
ContentHandler handler = new BodyContentHandler();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
index 5ba8b24..77508e1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
@@ -17,16 +17,16 @@
package org.apache.tika.parser.html;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.mime.MediaType;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java
index dcd9306..0b48d8c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.parser.html;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -26,8 +26,8 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
@@ -39,7 +39,7 @@ public class HtmlEncodingDetectorTest {
}
@Test
- @Ignore("can we can prove this harms detection")
+ @Disabled("can we can prove this harms detection")
public void utf16() throws IOException {
// According to the specification 'If charset is a UTF-16 encoding,
// then set charset to UTF-8.'
@@ -59,7 +59,7 @@ public class HtmlEncodingDetectorTest {
}
@Test
- @Ignore("until we do a full parse")
+ @Disabled("until we do a full parse")
public void insideTag() throws IOException {
assertWindows1252("<meta name='description'" +
"content='If I write charset=UTF-8 here, it doesnt mean the page is in UTF-8'/>" +
@@ -67,7 +67,7 @@ public class HtmlEncodingDetectorTest {
}
@Test
- @Ignore("until we do a full parse")
+ @Disabled("until we do a full parse")
public void missingAttribute() throws IOException {
assertWindows1252("<meta content='charset=UTF-8'>" + // missing http-equiv attribute
"<meta charset='WINDOWS-1252'>" // valid declaration
@@ -75,7 +75,7 @@ public class HtmlEncodingDetectorTest {
}
@Test
- @Ignore("until we do a full parse")
+ @Disabled("until we do a full parse")
public void insideSpecialTag() throws IOException {
// Content inside <?, <!, and </ should be ignored
for (byte b : "?!/".getBytes(StandardCharsets.US_ASCII))
@@ -86,7 +86,7 @@ public class HtmlEncodingDetectorTest {
}
@Test
- @Ignore("until we can prove this harms detection")
+ @Disabled("until we can prove this harms detection")
public void spaceBeforeTag() throws IOException {
assertWindows1252("< meta charset='UTF-8'>" + // invalid charset declaration
"<meta charset='WINDOWS-1252'>" // real charset declaration
@@ -101,7 +101,7 @@ public class HtmlEncodingDetectorTest {
}
@Test
- @Ignore("until we can prove this harms detection")
+ @Disabled("until we can prove this harms detection")
public void unmatchedQuote() throws IOException {
assertWindows1252("<meta http-equiv='content-type' content='charset=\"UTF-8'>" +
// invalid charset declaration
@@ -111,7 +111,7 @@ public class HtmlEncodingDetectorTest {
@Test
- @Ignore("until we do a full parse")
+ @Disabled("until we do a full parse")
public void withCompactComment() throws IOException {
// <!--> is a valid comment
assertWindows1252("<!--" + // start comment
@@ -127,7 +127,8 @@ public class HtmlEncodingDetectorTest {
}
private void assertCharset(String html, Charset charset) throws IOException {
- assertEquals(html + " should be detected as " + charset, charset, detectCharset(html));
+ assertEquals(charset, detectCharset(html),
+ html + " should be detected as " + charset);
}
private Charset detectCharset(String test) throws IOException {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
index 9184a97..6da8449 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -19,10 +19,10 @@ package org.apache.tika.parser.html;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -54,8 +54,8 @@ import javax.xml.transform.stream.StreamResult;
import org.ccil.cowan.tagsoup.HTMLSchema;
import org.ccil.cowan.tagsoup.Schema;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -120,26 +120,26 @@ public class HtmlParserTest extends TikaTest {
assertEquals("test-anchor", name.toString());
String content = body.toString();
- assertTrue("Did not contain expected text:" + "Test Indexation Html",
- content.contains("Test Indexation Html"));
- assertTrue("Did not contain expected text:" + "Indexation du fichier",
- content.contains("Indexation du fichier"));
+ assertTrue(content.contains("Test Indexation Html"),
+ "Did not contain expected text:" + "Test Indexation Html");
+ assertTrue(content.contains("Indexation du fichier"),
+ "Did not contain expected text:" + "Indexation du fichier");
}
@Test
- @Ignore("The file 'testXHTML_utf8.html' is not available for testing")
+ @Disabled("The file 'testXHTML_utf8.html' is not available for testing")
public void XtestParseUTF8() throws IOException, SAXException, TikaException {
String path = "/test-documents/testXHTML_utf8.html";
Metadata metadata = new Metadata();
String content = new Tika().parseToString(getResourceAsStream(path), metadata);
- assertTrue("Did not contain expected text:" + "Title : Tilte with UTF-8 chars öäå",
- content.contains("Title : Tilte with UTF-8 chars öäå"));
+ assertTrue(content.contains("Title : Tilte with UTF-8 chars öäå"),
+ "Did not contain expected text:" + "Title : Tilte with UTF-8 chars öäå");
- assertTrue("Did not contain expected text:" + "Content with UTF-8 chars",
- content.contains("Content with UTF-8 chars"));
+ assertTrue(content.contains("Content with UTF-8 chars"),
+ "Did not contain expected text:" + "Content with UTF-8 chars");
- assertTrue("Did not contain expected text:" + "åäö", content.contains("åäö"));
+ assertTrue(content.contains("åäö"), "Did not contain expected text:" + "åäö");
}
@Test
@@ -587,9 +587,10 @@ public class HtmlParserTest extends TikaTest {
String result = sw.toString();
// <object> tag should exist with fully resolved URLs
- assertTrue("<object> tag not correctly found in:\n" + result, Pattern.matches(
- "(?s).*<object data=\"http://domain.com/object.data\".*<param .* name=\"name\" value=\"value\"/>.*</object>.*$",
- result));
+ assertTrue(Pattern.matches(
+ "(?s).*<object data=\"http://domain.com/object.data\".*<param .* name=\"name\" value=\"value\"/>.*</object>.*$",
+ result),
+ "<object> tag not correctly found in:\n" + result);
}
/**
@@ -757,12 +758,11 @@ public class HtmlParserTest extends TikaTest {
new HtmlParser().parse(getResourceAsStream(path), bpch, metadata, new ParseContext());
String content = sw.toString();
- assertTrue("Has empty table elements",
- content.contains("<body><table><tr><td><table><tr><td>"));
- assertTrue("Has empty a element",
- content.contains("<a shape=\"rect\" href=\"Main.php\"/>"));
- assertTrue("Has real content", content.contains("<p>This is the real meat"));
- assertTrue("Ends with appropriate HTML", content.endsWith("</p></body></html>"));
+ assertTrue(content.contains("<body><table><tr><td><table><tr><td>"),
+ "Has empty table elements");
+ assertTrue(content.contains("<a shape=\"rect\" href=\"Main.php\"/>"), "Has empty a element");
+ assertTrue(content.contains("<p>This is the real meat"), "Has real content");
+ assertTrue(content.endsWith("</p></body></html>"), "Ends with appropriate HTML");
assertFalse(content.contains("boilerplate"));
assertFalse(content.contains("footer"));
}
@@ -839,8 +839,8 @@ public class HtmlParserTest extends TikaTest {
metadata, new ParseContext());
assertEquals("fr", metadata.get(Metadata.CONTENT_LANGUAGE));
- assertTrue("Missing HTML lang attribute",
- Pattern.matches("(?s)<html[^>]* lang=\"fr\".*", sw.toString()));
+ assertTrue(Pattern.matches("(?s)<html[^>]* lang=\"fr\".*", sw.toString()),
+ "Missing HTML lang attribute");
}
/**
@@ -936,7 +936,7 @@ public class HtmlParserTest extends TikaTest {
for (int i = 1; i <= 4; i++) {
String fileName = "/test-documents/testHTMLNoisyMetaEncoding_" + i + ".html";
String content = tika.parseToString(getResourceAsStream(fileName));
- assertTrue("testing: " + fileName, content.contains(hit));
+ assertTrue(content.contains(hit), "testing: " + fileName);
}
}
@@ -1214,7 +1214,7 @@ public class HtmlParserTest extends TikaTest {
}
@Test
- @Ignore("until we fix TIKA-1896")
+ @Disabled("until we fix TIKA-1896")
public void testBadScript() throws Exception {
String xml = getXML("testHTMLBadScript.html").xml;
assertContains("This is a test", xml);
@@ -1273,7 +1273,7 @@ public class HtmlParserTest extends TikaTest {
List<Path> tmp = new ArrayList<>();
Map<Path, String> encodings = new ConcurrentHashMap<>();
File[] testDocArray = testDocs.toFile().listFiles();
- assertNotNull("no test docs??", testDocArray);
+ assertNotNull(testDocArray, "no test docs??");
for (File file : testDocArray) {
if (file.getName().endsWith(".txt") || file.getName().endsWith(".html")) {
String encoding = getEncoding(detector, file.toPath());
@@ -1366,9 +1366,9 @@ public class HtmlParserTest extends TikaTest {
}
String detectedEncoding = getEncoding(detector, p);
String trueEncoding = encodings.get(p);
- assertEquals("detector class=" + detector.getClass() + " : file=" + p.toString(),
- trueEncoding, detectedEncoding);
-
+ assertEquals(trueEncoding, detectedEncoding,
+ "detector class=" + detector.getClass() + " : file=" + p.toString()
+ );
}
return DONE;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java
index 671743f..bb323c9 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java
@@ -17,9 +17,8 @@
package org.apache.tika.parser.html;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -29,8 +28,8 @@ import java.io.SequenceInputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector;
@@ -39,7 +38,7 @@ import org.apache.tika.parser.html.charsetdetector.charsets.ReplacementCharset;
public class StandardHtmlEncodingDetectorTest {
private Metadata metadata = new Metadata();
- @Before
+ @BeforeEach
public void setUp() {
this.metadata = new Metadata();
}
@@ -347,7 +346,8 @@ public class StandardHtmlEncodingDetectorTest {
final Charset contentsCharset = (charset == null) ? StandardCharsets.UTF_8 : charset;
InputStream inStream = new ByteArrayInputStream(html.getBytes(contentsCharset));
final Charset detected = detectCharset(inStream);
- assertEquals(html + " should be detected as " + charset, charset, detected);
+ assertEquals(charset, detected,
+ html + " should be detected as " + charset);
}
private void assertCharset(InputStream inStream, Charset charset) throws IOException {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java
index 3681243..b8fa07f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java
@@ -17,12 +17,12 @@
package org.apache.tika.parser.image;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java
index 225f6ae..dd95363 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java
@@ -18,7 +18,7 @@ package org.apache.tika.parser.image;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.metadata.Metadata;
@@ -29,6 +29,7 @@ import org.apache.tika.parser.Parser;
* Test class for the ICNSParser
*/
public class ICNSParserTest {
+
private final Parser parser = new ICNSParser();
/**
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java
index b28291e..4a32c6c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java
@@ -16,11 +16,10 @@
*/
package org.apache.tika.parser.image;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.GregorianCalendar;
@@ -35,7 +34,7 @@ import com.drew.metadata.Tag;
import com.drew.metadata.exif.ExifIFD0Directory;
import com.drew.metadata.exif.ExifSubIFDDirectory;
import com.drew.metadata.jpeg.JpegCommentDirectory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.apache.tika.metadata.Metadata;
@@ -82,8 +81,8 @@ public class ImageMetadataExtractorTest {
Metadata metadata = new Metadata();
new ImageMetadataExtractor.ExifHandler().handle(exif, metadata);
- assertEquals("Should be ISO date without time zone", "2000-01-01T00:00:00",
- metadata.get(TikaCoreProperties.CREATED));
+ assertEquals("2000-01-01T00:00:00", metadata.get(TikaCoreProperties.CREATED),
+ "Should be ISO date without time zone");
}
@Test
@@ -98,8 +97,8 @@ public class ImageMetadataExtractorTest {
Metadata metadata = new Metadata();
new ImageMetadataExtractor.ExifHandler().handle(exif, metadata);
- assertEquals("Should try EXIF Date/Time if Original is not set", "1999-01-01T00:00:00",
- metadata.get(TikaCoreProperties.CREATED));
+ assertEquals("1999-01-01T00:00:00", metadata.get(TikaCoreProperties.CREATED),
+ "Should try EXIF Date/Time if Original is not set");
}
@Test
@@ -110,8 +109,8 @@ public class ImageMetadataExtractorTest {
Metadata metadata = new Metadata();
new ImageMetadataExtractor.ExifHandler().handle(exif, metadata);
- assertEquals("Parsing should proceed without date", null,
- metadata.get(TikaCoreProperties.CREATED));
+ assertNull(metadata.get(TikaCoreProperties.CREATED),
+ "Parsing should proceed without date");
}
@Test
@@ -131,8 +130,8 @@ public class ImageMetadataExtractorTest {
Metadata metadata = new Metadata();
new ImageMetadataExtractor.CopyUnknownFieldsHandler().handle(d, metadata);
assertEquals("t1", metadata.get("Image Description"));
- assertNull("keywords should be excluded from bulk copy because it is a defined field",
- metadata.get(TikaCoreProperties.SUBJECT));
+ assertNull(metadata.get(TikaCoreProperties.SUBJECT),
+ "keywords should be excluded from bulk copy because it is a defined field");
assertNull(metadata.get(TikaCoreProperties.DESCRIPTION));
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
index 5773ae7..9892553 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.image;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
index b4b76c8..69051aa 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
@@ -16,19 +16,19 @@
*/
package org.apache.tika.parser.image;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.TimeZone;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.metadata.Metadata;
@@ -49,12 +49,12 @@ public class JpegParserTest {
//for testing across different time zones.
//We also appear to have to specify it in the surefire config:
//<argLine>-Duser.timezone=UTC</argLine>
- @BeforeClass
+ @BeforeAll
public static void setDefaultTimeZone() {
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
}
- @AfterClass
+ @AfterAll
public static void resetDefaultTimeZone() {
TimeZone.setDefault(CURR_TIME_ZONE);
}
@@ -94,12 +94,12 @@ public class JpegParserTest {
// Common tags
assertEquals("2009-10-02T23:02:49", metadata.get(TikaCoreProperties.MODIFIED));
- assertEquals("Date/Time Original for when the photo was taken, unspecified time zone",
- "2009-08-11T09:09:45", metadata.get(TikaCoreProperties.CREATED));
+ assertEquals("2009-08-11T09:09:45", metadata.get(TikaCoreProperties.CREATED),
+ "Date/Time Original for when the photo was taken, unspecified time zone");
List<String> keywords = Arrays.asList(metadata.getValues(TikaCoreProperties.SUBJECT));
- assertTrue("'canon-55-250' expected in " + keywords, keywords.contains("canon-55-250"));
- assertTrue("'moscow-birds' expected in " + keywords, keywords.contains("moscow-birds"));
- assertTrue("'serbor' expected in " + keywords, keywords.contains("serbor"));
+ assertTrue(keywords.contains("canon-55-250"), "'canon-55-250' expected in " + keywords);
+ assertTrue(keywords.contains("moscow-birds"), "'moscow-birds' expected in " + keywords);
+ assertTrue(keywords.contains("serbor"), "'serbor' expected in " + keywords);
assertFalse(keywords.contains("canon-55-250 moscow-birds serbor"));
}
@@ -139,14 +139,13 @@ public class JpegParserTest {
assertEquals("Inch", metadata.get(Metadata.RESOLUTION_UNIT));
// Common tags
- assertEquals("Date/Time Original for when the photo was taken, unspecified time zone",
- "2009-08-11T09:09:45", metadata.get(TikaCoreProperties.CREATED));
- assertEquals(
+ assertEquals("2009-08-11T09:09:45", metadata.get(TikaCoreProperties.CREATED),
+ "Date/Time Original for when the photo was taken, unspecified time zone");
+ assertEquals("2009-10-02T23:02:49", metadata.get(TikaCoreProperties.MODIFIED),
"This image has different Date/Time than Date/Time Original, " +
- "so it is probably modification date",
- "2009-10-02T23:02:49", metadata.get(TikaCoreProperties.MODIFIED));
- assertEquals("Date/Time Original should be stored in EXIF field too", "2009-08-11T09:09:45",
- metadata.get(TIFF.ORIGINAL_DATE));
+ "so it is probably modification date");
+ assertEquals("2009-08-11T09:09:45", metadata.get(TIFF.ORIGINAL_DATE),
+ "Date/Time Original should be stored in EXIF field too");
assertEquals("canon-55-250", metadata.getValues(TikaCoreProperties.SUBJECT)[0]);
}
@@ -231,7 +230,7 @@ public class JpegParserTest {
metadata.get(TikaCoreProperties.DESCRIPTION));
assertEquals("Some Tourist", metadata.get(TikaCoreProperties.CREATOR));
List<String> keywords = Arrays.asList(metadata.getValues(TikaCoreProperties.SUBJECT));
- assertTrue("got " + keywords, keywords.contains("bird watching"));
+ assertTrue(keywords.contains("bird watching"), "got " + keywords);
}
@Test
@@ -252,9 +251,8 @@ public class JpegParserTest {
// but we have to replace them with underscore
String[] subject = metadata.getValues(TikaCoreProperties.SUBJECT);
List<String> keywords = Arrays.asList(subject);
- assertTrue("'coast'" + " not in " + keywords, keywords.contains("coast"));
- assertTrue("'nature reserve'" + " not in " + keywords,
- keywords.contains("nature reserve"));
+ assertTrue(keywords.contains("coast"), "'coast'" + " not in " + keywords);
+ assertTrue(keywords.contains("nature reserve"), "'nature reserve'" + " not in " + keywords);
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
index 58f1f91..fdac6d0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.tika.parser.image;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.TikaTest;
@@ -76,11 +77,13 @@ public class PSDParserTest extends TikaTest {
metadata.get(XMPMM.HISTORY_EVENT_INSTANCEID));
}
- @Test(expected = TikaException.class)
+ @Test
public void testMaxLength() throws Exception {
TikaConfig config = new TikaConfig(getResourceAsStream("tika-config-TIKA-3243.xml"));
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, "image/x-psd");
- getXML("testPSD_xmp.psd", config.getParser(), metadata);
+ assertThrows(TikaException.class, () -> {
+ getXML("testPSD_xmp.psd", config.getParser(), metadata);
+ });
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
index 9d26c9e..60baf04 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.parser.image;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java
index fcf2cce..c64b029 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java
@@ -17,10 +17,9 @@
package org.apache.tika.parser.mailcommons;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Message;
import org.apache.tika.metadata.Metadata;
@@ -47,10 +46,10 @@ public class MailUtilTest {
Metadata m = new Metadata();
MailUtil.setPersonAndEmail(string, Message.MESSAGE_FROM_NAME, Message.MESSAGE_FROM_EMAIL,
m);
- assertEquals(person + " : " + m.get(Message.MESSAGE_FROM_NAME), person,
- m.get(Message.MESSAGE_FROM_NAME));
- assertEquals(email + " : " + m.get(Message.MESSAGE_FROM_EMAIL), email,
- m.get(Message.MESSAGE_FROM_EMAIL));
+ assertEquals(person, m.get(Message.MESSAGE_FROM_NAME),
+ person + " : " + m.get(Message.MESSAGE_FROM_NAME));
+ assertEquals(email, m.get(Message.MESSAGE_FROM_EMAIL),
+ email + " : " + m.get(Message.MESSAGE_FROM_EMAIL));
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
index 1a6410c..4b77de3 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.mail;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -40,8 +40,8 @@ import java.util.List;
import java.util.Locale;
import org.apache.james.mime4j.stream.MimeConfig;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.DefaultHandler;
@@ -72,11 +72,11 @@ public class RFC822ParserTest extends TikaTest {
private static InputStream getStream(String name) {
InputStream stream =
Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
- assertNotNull("Test file not found " + name, stream);
+ assertNotNull(stream, "Test file not found " + name);
return stream;
}
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
try (InputStream is = getStream(
@@ -407,8 +407,8 @@ public class RFC822ParserTest extends TikaTest {
"96/12/02",}) {
Date parsedDate = getDate(dateString);
if (parsedDate != null) {
- assertTrue("date must be after 1980:" + dateString,
- parsedDate.getTime() > date1980.getTime());
+ assertTrue(parsedDate.getTime() > date1980.getTime(),
+ "date must be after 1980:" + dateString);
}
}
//TODO: mime4j misparses these to pre 1980 dates
@@ -421,11 +421,11 @@ public class RFC822ParserTest extends TikaTest {
private void testDate(String dateString, String expected) throws Exception {
Date parsedDate = getDate(dateString);
- assertNotNull("couldn't parse " + dateString, parsedDate);
+ assertNotNull(parsedDate, "couldn't parse " + dateString);
DateFormat df =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", new DateFormatSymbols(Locale.US));
String parsedDateString = df.format(parsedDate);
- assertEquals("failed to match: " + dateString, expected, parsedDateString);
+ assertEquals(expected, parsedDateString, "failed to match: " + dateString);
}
private Date getDate(String dateString) throws Exception {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
index 634240d..b019324 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.mbox;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -42,7 +42,7 @@ public class MboxParserTest extends TikaTest {
private TypeDetector typeDetector;
private MboxParser mboxParser;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
typeDetector = new TypeDetector();
autoDetectParser = new AutoDetectParser(typeDetector);
@@ -68,7 +68,7 @@ public class MboxParserTest extends TikaTest {
assertEquals("application/mbox", metadata.get(Metadata.CONTENT_TYPE));
Map<Integer, Metadata> mailsMetadata = mboxParser.getTrackingMetadata();
- assertEquals("Nb. Of mails", 2, mailsMetadata.size());
+ assertEquals(2, mailsMetadata.size(), "Nb. Of mails");
Metadata mail1 = mailsMetadata.get(0);
assertEquals("message/rfc822", mail1.get(Metadata.CONTENT_TYPE));
@@ -91,7 +91,7 @@ public class MboxParserTest extends TikaTest {
}
assertContains("Test content", handler.toString());
- assertEquals("Nb. Of mails", 1, mboxParser.getTrackingMetadata().size());
+ assertEquals(1, mboxParser.getTrackingMetadata().size(), "Nb. Of mails");
Metadata mailMetadata = mboxParser.getTrackingMetadata().get(0);
@@ -112,7 +112,7 @@ public class MboxParserTest extends TikaTest {
mboxParser.parse(stream, handler, metadata, recursingContext);
}
- assertEquals("Nb. Of mails", 1, mboxParser.getTrackingMetadata().size());
+ assertEquals(1, mboxParser.getTrackingMetadata().size(), "Nb. Of mails");
Metadata mailMetadata = mboxParser.getTrackingMetadata().get(0);
assertEquals("from xxx by xxx with xxx; date", mailMetadata.get("MboxParser-received"));
@@ -140,7 +140,7 @@ public class MboxParserTest extends TikaTest {
mboxParser.parse(stream, handler, metadata, recursingContext);
}
- assertEquals("Nb. Of mails", 3, mboxParser.getTrackingMetadata().size());
+ assertEquals(3, mboxParser.getTrackingMetadata().size(), "Nb. Of mails");
Metadata firstMail = mboxParser.getTrackingMetadata().get(0);
assertEquals("Re: question about when shuffle/sort start working",
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java
index 7ce088c..d93b450 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.net.URL;
@@ -54,7 +54,7 @@ public abstract class AbstractPOIContainerExtractionTest extends TikaTest {
protected static TikaInputStream getTestFile(String filename) throws Exception {
URL input =
AbstractPOIContainerExtractionTest.class.getResource("/test-documents/" + filename);
- assertNotNull(filename + " not found", input);
+ assertNotNull(input, filename + " not found");
return TikaInputStream.get(input);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
index 170a6eb..318976e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
index 9aefb42..34d4179 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
@@ -16,17 +16,17 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
index 0038ede..b8ae14d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
@@ -17,15 +17,15 @@
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.EncryptedDocumentException;
@@ -107,7 +107,7 @@ public class JackcessParserTest extends TikaTest {
} catch (EncryptedDocumentException e) {
ex = true;
}
- assertTrue("failed to throw encrypted document exception for wrong password", ex);
+ assertTrue(ex, "failed to throw encrypted document exception for wrong password");
//now try null
c.set(PasswordProvider.class, metadata -> null);
@@ -119,7 +119,7 @@ public class JackcessParserTest extends TikaTest {
} catch (EncryptedDocumentException e) {
ex = true;
}
- assertTrue("failed to throw encrypted document exception for null password", ex);
+ assertTrue(ex, "failed to throw encrypted document exception for null password");
//now try missing password provider
@@ -131,8 +131,8 @@ public class JackcessParserTest extends TikaTest {
} catch (EncryptedDocumentException e) {
ex = true;
}
- assertTrue("failed to throw encrypted document exception for missing password provider",
- ex);
+ assertTrue(ex,
+ "failed to throw encrypted document exception for missing password provider");
//now try password on file that doesn't need a password
c = new ParseContext();
@@ -143,8 +143,8 @@ public class JackcessParserTest extends TikaTest {
} catch (EncryptedDocumentException e) {
ex = true;
}
- assertFalse("shouldn't have thrown encrypted document exception for " +
- "opening unencrypted file that doesn't need passowrd", ex);
+ assertFalse(ex, "shouldn't have thrown encrypted document exception for " +
+ "opening unencrypted file that doesn't need passowrd");
assertContains("red and brown", content);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java
index 8580bda..da55299 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.TikaCoreProperties;
public class MSOwnerFileParserTest extends TikaTest {
+
@Test
public void testBasic() throws Exception {
XMLResult r = getXML("testMSOwnerFile");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
index 508a9c0..71b42ff 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.io.TikaInputStream;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java
index 43de394..97def48 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java
@@ -17,10 +17,10 @@
package org.apache.tika.parser.microsoft;
import static org.apache.tika.parser.microsoft.AbstractPOIContainerExtractionTest.getTestFile;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -50,7 +50,7 @@ public class OldExcelParserTest extends TikaTest {
// Disabled, until we can get the POI code to tell us the version
@Test
- @Ignore
+ @Disabled
public void testMetadata() throws Exception {
TikaInputStream stream = getTestFile(file);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
index a11b61a..1863c74 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.io.StringWriter;
@@ -31,7 +31,7 @@ import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -269,9 +269,9 @@ public class OutlookParserTest extends TikaTest {
}
private void testMsgClass(String expected, Metadata metadata) {
- assertTrue(expected + ", but got: " + metadata.get(Office.MAPI_MESSAGE_CLASS),
- expected.equalsIgnoreCase(
- metadata.get(Office.MAPI_MESSAGE_CLASS).replaceAll("_", "")));
+ assertTrue(expected.equalsIgnoreCase(
+ metadata.get(Office.MAPI_MESSAGE_CLASS).replaceAll("_", "")),
+ expected + ", but got: " + metadata.get(Office.MAPI_MESSAGE_CLASS));
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
index ed0e9a1..55ec414 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.detect.microsoft.POIFSContainerDetector;
import org.apache.tika.extractor.ContainerExtractor;
@@ -157,7 +157,7 @@ public class POIContainerExtractionTest extends AbstractPOIContainerExtractionTe
}
assertNull(m.get(TikaCoreProperties.EMBEDDED_EXCEPTION));
}
- assertTrue("didn't find chart in " + suffix, found);
+ assertTrue(found, "didn't find chart in " + suffix);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
index d2d0ee6..09b80d6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -121,7 +122,7 @@ public class PowerPointParserTest extends TikaTest {
}
@Test
- @Ignore("not sure why this isn't working")
+ @Disabled("not sure why this isn't working")
public void testSkipHeaderFooter() throws Exception {
//now test turning off header/footer
OfficeParserConfig config = new OfficeParserConfig();
@@ -157,7 +158,7 @@ public class PowerPointParserTest extends TikaTest {
}
@Test
- @Ignore("not working")
+ @Disabled("not working")
public void testTurningOffMasterFooter() throws Exception {
//now test turning off master content
OfficeParserConfig config = new OfficeParserConfig();
@@ -317,9 +318,11 @@ public class PowerPointParserTest extends TikaTest {
metadataList.get(0).get(TikaCoreProperties.TIKA_META_EXCEPTION_EMBEDDED_STREAM));
}
- @Test(expected = EncryptedDocumentException.class)
+ @Test
public void testEncrypted() throws Exception {
- getXML("testPPT_protected_passtika.ppt");
+ assertThrows(EncryptedDocumentException.class, () -> {
+ getXML("testPPT_protected_passtika.ppt");
+ });
}
@Test
@@ -356,14 +359,14 @@ public class PowerPointParserTest extends TikaTest {
}
- @Ignore("until we add smart text extraction")
+ @Disabled("until we add smart text extraction")
@Test
public void testSmartArtText() throws Exception {
String content = getXML("testPPT_groups.ppt").xml;
assertContains("smart1", content);
}
- @Ignore("until we fix hyperlink extraction from text boxes")
+ @Disabled("until we fix hyperlink extraction from text boxes")
@Test
public void testHyperlinksInTextBoxes() throws Exception {
String content = getXML("testPPT_groups.ppt").xml;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java
index 84292d4..4bd349e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
index d6d789c..db47bc4 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.microsoft;
import static org.apache.tika.TikaTest.assertContains;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
index 4ddb020..41d985a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java
index 3434df0..4f254f0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.detect.DefaultDetector;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
index 8fb1ee9..8d3c068 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.microsoft;
import static org.apache.tika.TikaTest.assertContains;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java
index 9026aa7..a894cae 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -47,5 +47,6 @@ public class WMFParserTest extends TikaTest {
assertEquals("image/wmf", wmfMetadata.get(Metadata.CONTENT_TYPE));
assertContains(expectedText, wmfMetadata.get(TikaCoreProperties.TIKA_CONTENT));
}
+
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
index c0e6113..f52b619 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.util.Arrays;
@@ -30,8 +30,8 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -111,9 +111,9 @@ public class WordParserTest extends TikaTest {
xml = getXML("testWORD_3imgs.doc").xml;
// Images 1-3
- assertTrue("Image not found in:\n" + xml, xml.contains("src=\"embedded:image1.png\""));
- assertTrue("Image not found in:\n" + xml, xml.contains("src=\"embedded:image2.jpg\""));
- assertTrue("Image not found in:\n" + xml, xml.contains("src=\"embedded:image3.png\""));
+ assertTrue(xml.contains("src=\"embedded:image1.png\""), "Image not found in:\n" + xml);
+ assertTrue(xml.contains("src=\"embedded:image2.jpg\""), "Image not found in:\n" + xml);
+ assertTrue(xml.contains("src=\"embedded:image3.png\""), "Image not found in:\n" + xml);
// Text too
assertTrue(xml.contains("<p>The end!"));
@@ -125,7 +125,7 @@ public class WordParserTest extends TikaTest {
// Make sure bold text arrived as single
// contiguous string even though Word parser
// handled this as 3 character runs
- assertTrue("Bold text wasn't contiguous: " + xml, xml.contains("F<b>oob</b>a<b>r</b>"));
+ assertTrue(xml.contains("F<b>oob</b>a<b>r</b>"), "Bold text wasn't contiguous: " + xml);
// TIKA-692: test document containing multiple
// character runs within a bold tag:
@@ -134,7 +134,7 @@ public class WordParserTest extends TikaTest {
// Make sure bold text arrived as single
// contiguous string even though Word parser
// handled this as 3 character runs
- assertTrue("Bold text wasn't contiguous: " + xml, xml.contains("F<b>oob</b>a<b>r</b>"));
+ assertTrue(xml.contains("F<b>oob</b>a<b>r</b>"), "Bold text wasn't contiguous: " + xml);
}
@Test
@@ -424,7 +424,7 @@ public class WordParserTest extends TikaTest {
}
@Test
- @Ignore //until we determine whether we can include test docs or not
+ @Disabled //until we determine whether we can include test docs or not
public void testHyperlinkStringLongNoCloseQuote() throws Exception {
//TIKA-1512, one cause: no closing quote on really long string
//test file derived from govdocs1 012152.doc
@@ -433,7 +433,7 @@ public class WordParserTest extends TikaTest {
}
@Test
- @Ignore //until we determine whether we can include test docs or not
+ @Disabled //until we determine whether we can include test docs or not
public void testHyperlinkStringLongCarriageReturn() throws Exception {
//TIKA-1512, one cause: no closing quote, but carriage return
//test file derived from govdocs1 040044.doc
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
index 34d72aa..1603684 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
@@ -20,7 +20,7 @@ import static org.apache.tika.TikaTest.assertContains;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java
index 1f42d7b..4786f7a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.microsoft.chm;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests major functionality of ChmBlockInfo
@@ -33,7 +33,7 @@ public class TestChmBlockInfo {
private ChmLzxcResetTable clrt = null;
private ChmLzxcControlData chmLzxcControlData = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
data = TestParameters.chmData;
/* Creates and parses itsf header */
@@ -104,7 +104,7 @@ public class TestChmBlockInfo {
}
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
data = null;
chmBlockInfo = null;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
index 04a33a2..2c9109b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
@@ -17,8 +17,9 @@
package org.apache.tika.parser.microsoft.chm;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -35,7 +36,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.apache.tika.MultiThreadedTikaTest;
@@ -205,9 +206,11 @@ public class TestChmExtraction extends MultiThreadedTikaTest {
}
}
- @Test(expected = TikaException.class)
- public void testOOM() throws Exception {
- getXML("testChm_oom.chm");
+ @Test
+ public void testOOM() {
+ assertThrows(TikaException.class, () -> {
+ getXML("testChm_oom.chm");
+ });
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java
index 264836c..9282851 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java
@@ -16,16 +16,16 @@
*/
package org.apache.tika.parser.microsoft.chm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
@@ -33,7 +33,7 @@ import org.apache.tika.exception.TikaException;
public class TestChmExtractor extends TikaTest {
private ChmExtractor chmExtractor = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
chmExtractor = new ChmExtractor(new ByteArrayInputStream(TestParameters.chmData));
}
@@ -67,7 +67,7 @@ public class TestChmExtractor extends TikaTest {
XMLResult r = getXML("testChm_oom.chm");
fail("should have thrown TikaException");
} catch (TikaException e) {
- assertTrue("correct exception thrown", true);
+ assertTrue(true, "correct exception thrown");
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java
index 6eac221..02ebe15 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.parser.microsoft.chm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests all public functions of ChmItsfHeader
@@ -30,7 +30,7 @@ import org.junit.Test;
public class TestChmItsfHeader {
private ChmItsfHeader chmItsfHeader = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
chmItsfHeader = new ChmItsfHeader();
byte[] data = TestParameters.chmData;
@@ -100,7 +100,7 @@ public class TestChmItsfHeader {
assertTrue(chmItsfHeader.toString().contains(TestParameters.VP_ISTF_SIGNATURE));
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
chmItsfHeader = null;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java
index a94548d..75e6863 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java
@@ -17,12 +17,12 @@
package org.apache.tika.parser.microsoft.chm;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests all public methods of the ChmItspHeader
@@ -30,7 +30,7 @@ import org.junit.Test;
public class TestChmItspHeader {
private ChmItspHeader chmItspHeader = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
byte[] data = TestParameters.chmData;
@@ -130,7 +130,7 @@ public class TestChmItspHeader {
assertTrue(chmItspHeader.toString().contains(TestParameters.VP_ISTP_SIGNATURE));
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
chmItspHeader = null;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java
index 35fcc26..d9c3da8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java
@@ -18,11 +18,11 @@ package org.apache.tika.parser.microsoft.chm;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.exception.TikaException;
@@ -30,7 +30,7 @@ public class TestChmLzxState {
private ChmLzxState chmLzxState;
private int windowSize;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
byte[] data = TestParameters.chmData;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java
index 16d83ec..dcb071a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java
@@ -17,12 +17,12 @@
package org.apache.tika.parser.microsoft.chm;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests all public methods of ChmLzxcControlData block
@@ -30,7 +30,7 @@ import org.junit.Test;
public class TestChmLzxcControlData {
private ChmLzxcControlData chmLzxcControlData = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
byte[] data = TestParameters.chmData;
/* Creates and parses itsf header */
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java
index 6ee81a4..318e89a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java
@@ -18,16 +18,16 @@
package org.apache.tika.parser.microsoft.chm;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestChmLzxcResetTable {
private ChmLzxcResetTable chmLzxcResetTable = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
byte[] data = TestParameters.chmData;
/* Creates and parses itsf header */
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java
index cd0dac9..ae6d212 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft.chm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests public methods of the DirectoryListingEntry class
@@ -30,7 +30,7 @@ import org.junit.Test;
public class TestDirectoryListingEntry {
private DirectoryListingEntry dle = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
dle = new DirectoryListingEntry(TestParameters.nameLength, TestParameters.entryName,
TestParameters.entryType, TestParameters.offset, TestParameters.length);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java
index 2ae5f08..97a93e9 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java
@@ -16,16 +16,16 @@
*/
package org.apache.tika.parser.microsoft.chm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestPmgiHeader {
ChmPmgiHeader chmPmgiHeader = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
byte[] data = TestParameters.chmData;
chmPmgiHeader = new ChmPmgiHeader();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java
index c3170b5..7edb707 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java
@@ -17,16 +17,16 @@
package org.apache.tika.parser.microsoft.chm;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestPmglHeader {
ChmPmglHeader chmPmglHeader = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
byte[] data = TestParameters.chmData;
chmPmglHeader = new ChmPmglHeader();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
index e01e9ee..eaff39b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
@@ -16,12 +16,14 @@
*/
package org.apache.tika.parser.microsoft.onenote;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.time.Instant;
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -51,11 +53,11 @@ public class OneNoteParserTest extends TikaTest {
List<String> originalAuthors = Arrays.asList(metadata.getValues("originalAuthors"));
assertContains("Microsoft\u0000", originalAuthors);
- Assert.assertEquals(Instant.ofEpochSecond(1336059427),
+ assertEquals(Instant.ofEpochSecond(1336059427),
Instant.ofEpochSecond(Long.parseLong(metadata.get("creationTimestamp"))));
- Assert.assertEquals(Instant.ofEpochMilli(1383613114000L),
+ assertEquals(Instant.ofEpochMilli(1383613114000L),
Instant.ofEpochMilli(Long.parseLong(metadata.get("lastModifiedTimestamp"))));
- Assert.assertEquals(Instant.ofEpochSecond(1446572147),
+ assertEquals(Instant.ofEpochSecond(1446572147),
Instant.ofEpochSecond(Long.parseLong(metadata.get("lastModified"))));
}
@@ -85,11 +87,11 @@ public class OneNoteParserTest extends TikaTest {
assertContains("Microsoft\u0000", originalAuthors);
assertContains("ndipiazza\u0000", mostRecentAuthors);
- Assert.assertEquals(Instant.ofEpochSecond(1336059427),
+ assertEquals(Instant.ofEpochSecond(1336059427),
Instant.ofEpochSecond(Long.parseLong(metadata.get("creationTimestamp"))));
- Assert.assertEquals(Instant.ofEpochMilli(1574426629000L),
+ assertEquals(Instant.ofEpochMilli(1574426629000L),
Instant.ofEpochMilli(Long.parseLong(metadata.get("lastModifiedTimestamp"))));
- Assert.assertEquals(Instant.ofEpochSecond(1574426628),
+ assertEquals(Instant.ofEpochSecond(1574426628),
Instant.ofEpochSecond(Long.parseLong(metadata.get("lastModified"))));
}
@@ -119,11 +121,11 @@ public class OneNoteParserTest extends TikaTest {
assertNotContained("Microsoft\u0000", originalAuthors);
assertContains("ndipiazza\u0000", mostRecentAuthors);
- Assert.assertEquals(Instant.ofEpochSecond(1574426349),
+ assertEquals(Instant.ofEpochSecond(1574426349),
Instant.ofEpochSecond(Long.parseLong(metadata.get("creationTimestamp"))));
- Assert.assertEquals(Instant.ofEpochMilli(1574426623000L),
+ assertEquals(Instant.ofEpochMilli(1574426623000L),
Instant.ofEpochMilli(Long.parseLong(metadata.get("lastModifiedTimestamp"))));
- Assert.assertEquals(Instant.ofEpochSecond(1574426624),
+ assertEquals(Instant.ofEpochSecond(1574426624),
Instant.ofEpochSecond(Long.parseLong(metadata.get("lastModified"))));
}
@@ -153,11 +155,11 @@ public class OneNoteParserTest extends TikaTest {
assertNotContained("Microsoft\u0000", originalAuthors);
assertContains("ndipiazza\u0000", mostRecentAuthors);
- Assert.assertEquals(Instant.ofEpochSecond(1574426385),
+ assertEquals(Instant.ofEpochSecond(1574426385),
Instant.ofEpochSecond(Long.parseLong(metadata.get("creationTimestamp"))));
- Assert.assertEquals(Instant.ofEpochMilli(1574426548000L),
+ assertEquals(Instant.ofEpochMilli(1574426548000L),
Instant.ofEpochMilli(Long.parseLong(metadata.get("lastModifiedTimestamp"))));
- Assert.assertEquals(Instant.ofEpochSecond(1574426547),
+ assertEquals(Instant.ofEpochSecond(1574426547),
Instant.ofEpochSecond(Long.parseLong(metadata.get("lastModified"))));
}
@@ -179,11 +181,11 @@ public class OneNoteParserTest extends TikaTest {
List<String> originalAuthors = Arrays.asList(metadata.getValues("originalAuthors"));
assertContains("nicholas dipiazza\u0000", originalAuthors);
- Assert.assertEquals(Instant.ofEpochSecond(1576107472),
+ assertEquals(Instant.ofEpochSecond(1576107472),
Instant.ofEpochSecond(Long.parseLong(metadata.get("creationTimestamp"))));
- Assert.assertEquals(Instant.ofEpochMilli(1576107481000L),
+ assertEquals(Instant.ofEpochMilli(1576107481000L),
Instant.ofEpochMilli(Long.parseLong(metadata.get("lastModifiedTimestamp"))));
- Assert.assertEquals(Instant.ofEpochSecond(1576107480),
+ assertEquals(Instant.ofEpochSecond(1576107480),
Instant.ofEpochSecond(Long.parseLong(metadata.get("lastModified"))));
}
@@ -226,7 +228,7 @@ public class OneNoteParserTest extends TikaTest {
public void testOneNoteEmbeddedWordDoc() throws Exception {
List<Metadata> metadataList = getRecursiveMetadata("testOneNoteEmbeddedWordDoc.one");
- Assert.assertTrue(metadataList.stream().anyMatch(
+ assertTrue(metadataList.stream().anyMatch(
ml -> "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
.equals(ml.get("Content-Type"))));
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
index 629b4c9..21e87b3 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.microsoft.ooxml;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.detect.microsoft.POIFSContainerDetector;
@@ -40,7 +40,7 @@ import org.apache.tika.parser.microsoft.AbstractPOIContainerExtractionTest;
public class OOXMLContainerExtractionTest extends AbstractPOIContainerExtractionTest {
private ContainerExtractor extractor;
- @Before
+ @BeforeEach
public void setUp() {
Tika tika = new Tika();
extractor = new ParserContainerExtractor(tika.getParser(), tika.getDetector());
@@ -318,7 +318,7 @@ public class OOXMLContainerExtractionTest extends AbstractPOIContainerExtraction
}
assertNull(m.get(TikaCoreProperties.EMBEDDED_EXCEPTION));
}
- assertTrue("didn't find chart in " + suffix, found);
+ assertTrue(found, "didn't find chart in " + suffix);
}
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
index 153f6fc..5035770 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
@@ -17,10 +17,12 @@
package org.apache.tika.parser.microsoft.ooxml;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -43,11 +45,11 @@ import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -55,6 +57,7 @@ import org.apache.tika.config.TikaConfig;
import org.apache.tika.detect.DefaultDetector;
import org.apache.tika.detect.Detector;
import org.apache.tika.exception.EncryptedDocumentException;
+import org.apache.tika.exception.TikaException;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Office;
@@ -75,18 +78,18 @@ public class OOXMLParserTest extends TikaTest {
private static Locale USER_LOCALE = null;
- @BeforeClass
+ @BeforeAll
public static void setUp() {
USER_LOCALE = LocaleUtil.getUserLocale();
}
- @AfterClass
+ @AfterAll
public static void tearDown() {
LocaleUtil.setUserLocale(USER_LOCALE);
Locale.setDefault(USER_LOCALE);
}
- @Before
+ @BeforeEach
public void beforeEach() {
LocaleUtil.setUserLocale(Locale.US);
Locale.setDefault(Locale.US);
@@ -182,7 +185,7 @@ public class OOXMLParserTest extends TikaTest {
}
@Test
- @Ignore("OOXML-Strict not currently supported by POI, see #57699")
+ @Disabled("OOXML-Strict not currently supported by POI, see #57699")
public void testExcelStrict() throws Exception {
Metadata metadata = new Metadata();
ParseContext context = new ParseContext();
@@ -232,8 +235,8 @@ public class OOXMLParserTest extends TikaTest {
ParseContext context = new ParseContext();
String content = getText(filename, metadata, context);
- assertEquals("Mime-type checking for " + filename, mimeTypes[i],
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(mimeTypes[i], metadata.get(Metadata.CONTENT_TYPE),
+ "Mime-type checking for " + filename);
assertEquals("Attachment Test", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Rajiv", metadata.get(TikaCoreProperties.CREATOR));
@@ -241,16 +244,16 @@ public class OOXMLParserTest extends TikaTest {
if (extension.equals("thmx")) {
assertEquals("", content);
} else {
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("Attachment Test"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("This is a test file data with the same content"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("content parsing"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("Different words to test against"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("Mystery"));
+ assertTrue(content.contains("Attachment Test"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("This is a test file data with the same content"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("content parsing"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("Different words to test against"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("Mystery"),
+ "Text missing for " + filename + "\n" + content);
}
}
@@ -283,8 +286,8 @@ public class OOXMLParserTest extends TikaTest {
final int currentI = i;
ContentHandler handler = new BodyContentHandler() {
public void startDocument() {
- assertEquals("Mime-type checking for " + filename, mimeTypes[currentI],
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(mimeTypes[currentI], metadata.get(Metadata.CONTENT_TYPE),
+ "Mime-type checking for " + filename);
assertEquals("Attachment Test", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Rajiv", metadata.get(TikaCoreProperties.CREATOR));
@@ -318,8 +321,8 @@ public class OOXMLParserTest extends TikaTest {
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
getXML(filename, metadata);
// Should get the metadata
- assertEquals("Mime-type checking for " + filename, mimeTypes[i],
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(mimeTypes[i], metadata.get(Metadata.CONTENT_TYPE),
+ "Mime-type checking for " + filename);
}
@@ -394,12 +397,12 @@ public class OOXMLParserTest extends TikaTest {
xml = result.xml;
// Images 2-4 (there is no 1!)
- assertTrue("Image not found in:\n" + xml,
- xml.contains("<img src=\"embedded:image2.png\" alt=\"A description...\" />"));
- assertTrue("Image not found in:\n" + xml,
- xml.contains("<img src=\"embedded:image3.jpeg\" alt=\"A description...\" />"));
- assertTrue("Image not found in:\n" + xml,
- xml.contains("<img src=\"embedded:image4.png\" alt=\"A description...\" />"));
+ assertTrue(xml.contains("<img src=\"embedded:image2.png\" alt=\"A description...\" />"),
+ "Image not found in:\n" + xml);
+ assertTrue(xml.contains("<img src=\"embedded:image3.jpeg\" alt=\"A description...\" />"),
+ "Image not found in:\n" + xml);
+ assertTrue(xml.contains("<img src=\"embedded:image4.png\" alt=\"A description...\" />"),
+ "Image not found in:\n" + xml);
// Text too
assertTrue(xml.contains("<p>The end!</p>"));
@@ -411,7 +414,7 @@ public class OOXMLParserTest extends TikaTest {
// Make sure bold text arrived as single
// contiguous string even though Word parser
// handled this as 3 character runs
- assertTrue("Bold text wasn't contiguous: " + xml, xml.contains("F<b>oob</b>a<b>r</b>"));
+ assertTrue(xml.contains("F<b>oob</b>a<b>r</b>"), "Bold text wasn't contiguous: " + xml);
// TIKA-692: test document containing multiple
// character runs within a bold tag:
@@ -420,7 +423,7 @@ public class OOXMLParserTest extends TikaTest {
// Make sure bold text arrived as single
// contiguous string even though Word parser
// handled this as 3 character runs
- assertTrue("Bold text wasn't contiguous: " + xml, xml.contains("F<b>oob</b>a<b>r</b>"));
+ assertTrue(xml.contains("F<b>oob</b>a<b>r</b>"), "Bold text wasn't contiguous: " + xml);
}
/**
@@ -439,7 +442,7 @@ public class OOXMLParserTest extends TikaTest {
}
@Test
- @Ignore("need to add links in xhtml")
+ @Disabled("need to add links in xhtml")
public void testPicturesInVariousPlaces() throws Exception {
//test that images are actually extracted from
//headers, footers, comments, endnotes, footnotes
@@ -502,8 +505,8 @@ public class OOXMLParserTest extends TikaTest {
*/
@Test
public void testNullHeaders() throws Exception {
-
- assertEquals("Should have found some text", false, getXML("NullHeader.docx").xml.isEmpty());
+ assertFalse(getXML("NullHeader.docx").xml.isEmpty(),
+ "Should have found some text");
}
@Test
@@ -700,7 +703,7 @@ public class OOXMLParserTest extends TikaTest {
}
@Test
- @Ignore("can't tell why this isn't working")
+ @Disabled("can't tell why this isn't working")
public void testTurningOffMasterContent() throws Exception {
//now test turning off master content
@@ -1708,13 +1711,15 @@ public class OOXMLParserTest extends TikaTest {
}
- @Test(expected = org.apache.tika.exception.TikaException.class)
+ @Test
public void testTruncatedSAXDocx() throws Exception {
ParseContext pc = new ParseContext();
OfficeParserConfig c = new OfficeParserConfig();
c.setUseSAXDocxExtractor(true);
pc.set(OfficeParserConfig.class, c);
- getRecursiveMetadata("testWORD_truncated.docx", pc);
+ assertThrows(TikaException.class, () -> {
+ getRecursiveMetadata("testWORD_truncated.docx", pc);
+ });
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
index 2372ecd..172f719 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.parser.microsoft.ooxml;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.util.HashMap;
@@ -27,9 +27,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -50,7 +50,7 @@ public class SXSLFExtractorTest extends TikaTest {
OfficeParserConfig officeParserConfig = new OfficeParserConfig();
private ParseContext parseContext;
- @Before
+ @BeforeEach
public void setUp() {
parseContext = new ParseContext();
officeParserConfig.setUseSAXPptxExtractor(true);
@@ -63,7 +63,7 @@ public class SXSLFExtractorTest extends TikaTest {
List<Metadata> metadataList = getRecursiveMetadata("testPPT_various2.pptx", parseContext);
- assertEquals("right number of attachments", 14, metadataList.size());
+ assertEquals(14, metadataList.size(), "right number of attachments");
String mainContent = metadataList.get(0).get(TikaCoreProperties.TIKA_CONTENT);
@@ -168,8 +168,8 @@ public class SXSLFExtractorTest extends TikaTest {
try (InputStream input = getResourceAsStream("/test-documents/" + filename)) {
AUTO_DETECT_PARSER.parse(input, handler, metadata, parseContext);
- assertEquals("Mime-type checking for " + filename, mimeTypes[i],
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(mimeTypes[i], metadata.get(Metadata.CONTENT_TYPE),
+ "Mime-type checking for " + filename);
assertEquals("Attachment Test", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Rajiv", metadata.get(TikaCoreProperties.CREATOR));
@@ -178,16 +178,16 @@ public class SXSLFExtractorTest extends TikaTest {
if (extension.equals("thmx")) {
assertEquals("", content);
} else {
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("Attachment Test"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("This is a test file data with the same content"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("content parsing"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("Different words to test against"));
- assertTrue("Text missing for " + filename + "\n" + content,
- content.contains("Mystery"));
+ assertTrue(content.contains("Attachment Test"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("This is a test file data with the same content"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("content parsing"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("Different words to test against"),
+ "Text missing for " + filename + "\n" + content);
+ assertTrue(content.contains("Mystery"),
+ "Text missing for " + filename + "\n" + content);
}
}
}
@@ -220,8 +220,8 @@ public class SXSLFExtractorTest extends TikaTest {
final int currentI = i;
ContentHandler handler = new BodyContentHandler() {
public void startDocument() {
- assertEquals("Mime-type checking for " + filename, mimeTypes[currentI],
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(mimeTypes[currentI], metadata.get(Metadata.CONTENT_TYPE),
+ "Mime-type checking for " + filename);
assertEquals("Attachment Test", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Rajiv", metadata.get(TikaCoreProperties.CREATOR));
@@ -258,8 +258,8 @@ public class SXSLFExtractorTest extends TikaTest {
AUTO_DETECT_PARSER.parse(input, handler, metadata, parseContext);
// Should get the metadata
- assertEquals("Mime-type checking for " + filename, mimeTypes[i],
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(mimeTypes[i], metadata.get(Metadata.CONTENT_TYPE),
+ "Mime-type checking for " + filename);
// But that's about it
}
@@ -336,7 +336,7 @@ public class SXSLFExtractorTest extends TikaTest {
}
@Test
- @Ignore("can't tell why this isn't working")
+ @Disabled("can't tell why this isn't working")
public void testTurningOffMasterContent() throws Exception {
//now test turning off master content
@@ -419,7 +419,7 @@ public class SXSLFExtractorTest extends TikaTest {
// TIKA-997:
@Test
- @Ignore("TODO: add in embedded file markup")
+ @Disabled("TODO: add in embedded file markup")
public void testEmbeddedZipInPPTX() throws Exception {
String xml = getXML("test_embedded_zip.pptx", parseContext).xml;
int h = xml.indexOf("<div class=\"embedded\" id=\"slide1_rId3\" />");
@@ -437,7 +437,7 @@ public class SXSLFExtractorTest extends TikaTest {
// TIKA-1032:
@Test
- @Ignore("TODO: add in embedded file markup")
+ @Disabled("TODO: add in embedded file markup")
public void testEmbeddedPPTXTwoSlides() throws Exception {
String xml = getXML("testPPT_embedded_two_slides.pptx", parseContext).xml;
assertContains("<div class=\"embedded\" id=\"slide1_rId7\" />", xml);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
index 3806518..1e2b0c1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
@@ -18,9 +18,9 @@
package org.apache.tika.parser.microsoft.ooxml;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -31,8 +31,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -52,7 +52,7 @@ public class SXWPFExtractorTest extends TikaTest {
private ParseContext parseContext;
- @Before
+ @BeforeEach
public void setUp() {
parseContext = new ParseContext();
OfficeParserConfig officeParserConfig = new OfficeParserConfig();
@@ -255,12 +255,12 @@ public class SXWPFExtractorTest extends TikaTest {
xml = result.xml;
// Images 2-4 (there is no 1!)
- assertTrue("Image not found in:\n" + xml,
- xml.contains("<img src=\"embedded:image2.png\" alt=\"A description...\" />"));
- assertTrue("Image not found in:\n" + xml,
- xml.contains("<img src=\"embedded:image3.jpeg\" alt=\"A description...\" />"));
- assertTrue("Image not found in:\n" + xml,
- xml.contains("<img src=\"embedded:image4.png\" alt=\"A description...\" />"));
+ assertTrue(xml.contains("<img src=\"embedded:image2.png\" alt=\"A description...\" />"),
+ "Image not found in:\n" + xml);
+ assertTrue(xml.contains("<img src=\"embedded:image3.jpeg\" alt=\"A description...\" />"),
+ "Image not found in:\n" + xml);
+ assertTrue(xml.contains("<img src=\"embedded:image4.png\" alt=\"A description...\" />"),
+ "Image not found in:\n" + xml);
// Text too
assertTrue(xml.contains("<p>The end!</p>"));
@@ -275,7 +275,7 @@ public class SXWPFExtractorTest extends TikaTest {
// Make sure bold text arrived as single
// contiguous string even though Word parser
// handled this as 3 character runs
- assertTrue("Bold text wasn't contiguous: " + xml, xml.contains("F<b>oob</b>a<b>r</b>"));
+ assertTrue(xml.contains("F<b>oob</b>a<b>r</b>"), "Bold text wasn't contiguous: " + xml);
// TIKA-692: test document containing multiple
// character runs within a bold tag:
@@ -284,7 +284,7 @@ public class SXWPFExtractorTest extends TikaTest {
// Make sure bold text arrived as single
// contiguous string even though Word parser
// handled this as 3 character runs
- assertTrue("Bold text wasn't contiguous: " + xml, xml.contains("F<b>oob</b>a<b>r</b>"));
+ assertTrue(xml.contains("F<b>oob</b>a<b>r</b>"), "Bold text wasn't contiguous: " + xml);
}
/**
@@ -335,8 +335,7 @@ public class SXWPFExtractorTest extends TikaTest {
@Test
public void testNullHeaders() throws Exception {
XMLResult xmlResult = getXML("NullHeader.docx", parseContext);
- assertEquals("Should have found some text", false, xmlResult.xml.isEmpty());
-
+ assertEquals(false, xmlResult.xml.isEmpty(), "Should have found some text");
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
index 833baeb..86de20d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser.microsoft.ooxml;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
@@ -31,8 +31,8 @@ import java.util.Random;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.io.IOUtils;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -77,7 +77,7 @@ public class TruncatedOOXMLTest extends TikaTest {
}
@Test
- @Ignore("for dev/debugging only")
+ @Disabled("for dev/debugging only")
public void listStreams() throws Exception {
File tstDir = new File(getResourceAsUri("/test-documents"));
for (File f : tstDir.listFiles()) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
index 5583cfd..b9a1270 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.parser.microsoft.ooxml.xps;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,7 +25,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java
index db09efe..0158e79 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java
@@ -17,12 +17,13 @@
package org.apache.tika.parser.microsoft.ooxml.xwpf.ml2006;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.apache.tika.MultiThreadedTikaTest;
import org.apache.tika.exception.TikaException;
@@ -38,7 +39,7 @@ import org.apache.tika.utils.XMLReaderUtils;
public class Word2006MLParserTest extends MultiThreadedTikaTest {
- @AfterClass
+ @AfterAll
public static void tearDown() throws TikaException {
XMLReaderUtils.setPoolSize(XMLReaderUtils.DEFAULT_POOL_SIZE);
}
@@ -175,7 +176,8 @@ public class Word2006MLParserTest extends MultiThreadedTikaTest {
}
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void testMultiThreaded() throws Exception {
XMLReaderUtils.setPoolSize(4);
int numThreads = XMLReaderUtils.getPoolSize() * 2;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java
index ebf63a0..c95547a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java
@@ -16,17 +16,17 @@
*/
package org.apache.tika.parser.microsoft.pst;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
index 2f6442d..65275f5 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.microsoft.rtf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.InputStream;
@@ -28,7 +28,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.TikaTest;
@@ -76,7 +76,7 @@ public class RTFParserTest extends TikaTest {
assertContains("\u5ff5", content);
assertContains("0 ", content);
assertContains("abc", content);
- assertFalse("Doubled character \u5E74", content.contains("\u5E74\u5E74"));
+ assertFalse(content.contains("\u5E74\u5E74"), "Doubled character \u5E74");
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java
index 82d17cd..3e00b60 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java
@@ -16,10 +16,11 @@
*/
package org.apache.tika.parser.microsoft.xml;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.apache.tika.MultiThreadedTikaTest;
import org.apache.tika.exception.TikaException;
@@ -31,7 +32,7 @@ import org.apache.tika.utils.XMLReaderUtils;
public class XML2003ParserTest extends MultiThreadedTikaTest {
- @AfterClass
+ @AfterAll
public static void tearDown() throws TikaException {
XMLReaderUtils.setPoolSize(XMLReaderUtils.DEFAULT_POOL_SIZE);
}
@@ -62,7 +63,8 @@ public class XML2003ParserTest extends MultiThreadedTikaTest {
}
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void testMultiThreaded() throws Exception {
XMLReaderUtils.setPoolSize(4);
int numThreads = XMLReaderUtils.getPoolSize() * 2;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java
index 8de4069..07345ce 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.parser.dbf;
-import static junit.framework.TestCase.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
index d061c1a..e4861cf 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.dif;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
index 49dff52..805417f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.parser.epub;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java
index bdf35db..f2dbe40 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.hwp;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.commons.io.filefilter.RegexFileFilter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.MultiThreadedTikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
index f19b8d7..d55a9fa 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.ibooks;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/mif/MIFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/mif/MIFParserTest.java
index 841d862..22c5d9e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/mif/MIFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/mif/MIFParserTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.parser.mif;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
index 006e72a..d433465 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.tika.parser.odf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.io.InputStream;
@@ -30,7 +31,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -366,47 +367,55 @@ public class ODFParserTest extends TikaTest {
"<span>Visit Tika</span></a>", xml);
}
- @Test(expected = IOException.class)
+ @Test
public void testInvalidFromStream() throws Exception {
try (InputStream is = getResourceAsUrl("/test-documents/testODTnotaZipFile.odt")
.openStream()) {
OpenDocumentParser parser = new OpenDocumentParser();
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
- parser.parse(is, handler, metadata, new ParseContext());
+ assertThrows(IOException.class, () -> {
+ parser.parse(is, handler, metadata, new ParseContext());
+ });
}
}
- @Test(expected = IOException.class)
+ @Test
public void testInvalidFromFile() throws Exception {
- try (TikaInputStream tis = TikaInputStream
+ try (TikaInputStream is = TikaInputStream
.get(getResourceAsUrl("/test-documents/testODTnotaZipFile.odt"))) {
OpenDocumentParser parser = new OpenDocumentParser();
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
- parser.parse(tis, handler, metadata, new ParseContext());
+ assertThrows(IOException.class, () -> {
+ parser.parse(is, handler, metadata, new ParseContext());
+ });
}
}
- @Test(expected = EncryptedDocumentException.class)
+ @Test
public void testEncryptedODTFile() throws Exception {
//the password to this file is "tika"
Path p =
Paths.get(
ODFParserTest.class.getResource(
"/test-documents/testODTEncrypted.odt").toURI());
- getRecursiveMetadata(p, false);
+ assertThrows(EncryptedDocumentException.class, () -> {
+ getRecursiveMetadata(p, false);
+ });
}
//this, of course, should throw an EncryptedDocumentException
//but the file can't be read by Java's ZipInputStream or
//by commons compress, unless you enable descriptors.
//https://issues.apache.org/jira/browse/ODFTOOLKIT-402
- @Test(expected = TikaException.class)
+ @Test
public void testEncryptedODTStream() throws Exception {
try (InputStream is = ODFParserTest.class.getResourceAsStream(
"/test-documents/testODTEncrypted.odt")) {
- getRecursiveMetadata(is, false);
+ assertThrows(TikaException.class, () -> {
+ getRecursiveMetadata(is, false);
+ });
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java
index 8160ec3..8ee09d5 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.wordperfect;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java
index b6239cd..bdfdc3c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java
@@ -17,12 +17,12 @@
package org.apache.tika.parser.wordperfect;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.EOFException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class WPInputStreamTest {
//These test that we guarantee that a byte is read/skipped with the readWPX calls
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
index aff918f..5b37b7b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.wordperfect;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java
index 9c875d8..a2a88ee 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.feed;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
@@ -30,6 +30,7 @@ import org.apache.tika.parser.ParseContext;
import org.apache.tika.sax.BodyContentHandler;
public class FeedParserTest {
+
@Test
public void testRSSParser() throws Exception {
// These RSS files should have basically the same contents,
@@ -44,7 +45,7 @@ public class FeedParserTest {
new FeedParser().parse(input, handler, metadata, context);
String content = handler.toString();
- assertFalse(content == null);
+ assertNotNull(content);
assertEquals("Sample RSS File for Junit test",
metadata.get(TikaCoreProperties.DESCRIPTION));
@@ -67,7 +68,7 @@ public class FeedParserTest {
new FeedParser().parse(input, handler, metadata, context);
String content = handler.toString();
- assertFalse(content == null);
+ assertNotNull(content);
assertEquals("Sample Atom File for Junit test",
metadata.get(TikaCoreProperties.DESCRIPTION));
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
index 3b2713e..6bd6ff0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.tika.parser.ocr;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -35,18 +36,17 @@ public class TesseractOCRConfigTest extends TikaTest {
@Test
public void testNoConfig() throws Exception {
TesseractOCRConfig config = new TesseractOCRConfig();
- assertEquals("Invalid default language value", "eng", config.getLanguage());
- assertEquals("Invalid default pageSegMode value", "1", config.getPageSegMode());
- assertEquals("Invalid default minFileSizeToOcr value", 0, config.getMinFileSizeToOcr());
- assertEquals("Invalid default maxFileSizeToOcr value", Integer.MAX_VALUE,
- config.getMaxFileSizeToOcr());
- assertEquals("Invalid default timeout value", 120, config.getTimeoutSeconds());
- assertEquals("Invalid default density value", 300, config.getDensity());
- assertEquals("Invalid default depth value", 4, config.getDepth());
- assertEquals("Invalid default colorpsace value", "gray", config.getColorspace());
- assertEquals("Invalid default filter value", "triangle", config.getFilter());
- assertEquals("Invalid default resize value", 200, config.getResize());
- assertEquals("Invalid default applyRotation value", false, config.isApplyRotation());
+ assertEquals("eng", config.getLanguage(), "Invalid default language value");
+ assertEquals("1", config.getPageSegMode(), "Invalid default pageSegMode value");
+ assertEquals(0, config.getMinFileSizeToOcr(), "Invalid default minFileSizeToOcr value");
+ assertEquals(Integer.MAX_VALUE, config.getMaxFileSizeToOcr(), "Invalid default maxFileSizeToOcr value");
+ assertEquals(120, config.getTimeoutSeconds(), "Invalid default timeout value");
+ assertEquals(300, config.getDensity(), "Invalid default density value");
+ assertEquals(4, config.getDepth(), "Invalid default depth value");
+ assertEquals("gray", config.getColorspace(), "Invalid default colorpsace value");
+ assertEquals("triangle", config.getFilter(), "Invalid default filter value");
+ assertEquals(200, config.getResize(), "Invalid default resize value");
+ assertEquals(false, config.isApplyRotation(), "Invalid default applyRotation value");
}
@Test
@@ -58,17 +58,16 @@ public class TesseractOCRConfigTest extends TikaTest {
(TesseractOCRParser) ((CompositeParser) new TikaConfig(stream).getParser())
.getAllComponentParsers().get(0);
TesseractOCRConfig config = parser.getDefaultConfig();
- assertEquals("Invalid overridden language value", "fra+deu", config.getLanguage());
- assertEquals("Invalid default pageSegMode value", "1", config.getPageSegMode());
- assertEquals("Invalid overridden minFileSizeToOcr value", 1, config.getMinFileSizeToOcr());
- assertEquals("Invalid default maxFileSizeToOcr value", Integer.MAX_VALUE,
- config.getMaxFileSizeToOcr());
- assertEquals("Invalid overridden timeout value", 240, config.getTimeoutSeconds());
- assertEquals("Invalid overridden density value", 200, config.getDensity());
- assertEquals("Invalid overridden depth value", 8, config.getDepth());
- assertEquals("Invalid overridden filter value", "box", config.getFilter());
- assertEquals("Invalid overridden resize value", 300, config.getResize());
- assertEquals("Invalid default applyRotation value", false, config.isApplyRotation());
+ assertEquals("fra+deu", config.getLanguage(), "Invalid overridden language value");
+ assertEquals("1", config.getPageSegMode(), "Invalid default pageSegMode value");
+ assertEquals(1, config.getMinFileSizeToOcr(), "Invalid overridden minFileSizeToOcr value");
+ assertEquals(Integer.MAX_VALUE, config.getMaxFileSizeToOcr(), "Invalid default maxFileSizeToOcr value");
+ assertEquals(240, config.getTimeoutSeconds(), "Invalid overridden timeout value");
+ assertEquals(200, config.getDensity(), "Invalid overridden density value");
+ assertEquals(8, config.getDepth(), "Invalid overridden depth value");
+ assertEquals("box", config.getFilter(), "Invalid overridden filter value");
+ assertEquals(300, config.getResize(), "Invalid overridden resize value");
+ assertEquals(false, config.isApplyRotation(), "Invalid default applyRotation value");
}
@Test
@@ -80,17 +79,17 @@ public class TesseractOCRConfigTest extends TikaTest {
(TesseractOCRParser) ((CompositeParser) new TikaConfig(stream).getParser())
.getAllComponentParsers().get(0);
TesseractOCRConfig config = parser.getDefaultConfig();
- assertEquals("Invalid overridden language value", "ceb", config.getLanguage());
- assertEquals("Invalid overridden pageSegMode value", "2", config.getPageSegMode());
- assertEquals("Invalid overridden minFileSizeToOcr value", 1, config.getMinFileSizeToOcr());
- assertEquals("Invalid overridden maxFileSizeToOcr value", 2000000,
- config.getMaxFileSizeToOcr());
- assertEquals("Invalid overridden timeout value", 240, config.getTimeoutSeconds());
- assertEquals("Invalid overridden density value", 200, config.getDensity());
- assertEquals("Invalid overridden depth value", 8, config.getDepth());
- assertEquals("Invalid overridden filter value", "box", config.getFilter());
- assertEquals("Invalid overridden resize value", 300, config.getResize());
- assertEquals("Invalid overridden applyRotation value", true, config.isApplyRotation());
+ assertEquals("ceb", config.getLanguage(), "Invalid overridden language value");
+ assertEquals("2", config.getPageSegMode(), "Invalid default pageSegMode value");
+ assertEquals(1, config.getMinFileSizeToOcr(), "Invalid overridden minFileSizeToOcr value");
+ assertEquals(2000000, config.getMaxFileSizeToOcr(), "Invalid default maxFileSizeToOcr " +
+ "value");
+ assertEquals(240, config.getTimeoutSeconds(), "Invalid overridden timeout value");
+ assertEquals(200, config.getDensity(), "Invalid overridden density value");
+ assertEquals(8, config.getDepth(), "Invalid overridden depth value");
+ assertEquals("box", config.getFilter(), "Invalid overridden filter value");
+ assertEquals(300, config.getResize(), "Invalid overridden resize value");
+ assertEquals(true, config.isApplyRotation(), "Invalid default applyRotation value");
}
@Test
@@ -104,7 +103,7 @@ public class TesseractOCRConfigTest extends TikaTest {
for (String language : validLanguages) {
config.setLanguage(language);
- assertEquals("Valid language not set", language, config.getLanguage());
+ assertEquals(language, config.getLanguage(), "Valid language not set");
}
}
@@ -126,86 +125,107 @@ public class TesseractOCRConfigTest extends TikaTest {
}
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testValidatePageSegMode() {
TesseractOCRConfig config = new TesseractOCRConfig();
config.setPageSegMode("0");
config.setPageSegMode("10");
- assertTrue("Couldn't set valid values", true);
- config.setPageSegMode("14");
+ assertTrue(true, "Couldn't set valid values");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.setPageSegMode("14");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testValidateDensity() {
TesseractOCRConfig config = new TesseractOCRConfig();
config.setDensity(300);
config.setDensity(400);
- assertTrue("Couldn't set valid values", true);
- config.setDensity(1);
+ assertTrue(true, "Couldn't set valid values");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.setDensity(1);
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testValidateDepth() {
TesseractOCRConfig config = new TesseractOCRConfig();
config.setDepth(4);
config.setDepth(8);
- assertTrue("Couldn't set valid values", true);
- config.setDepth(6);
+ assertTrue(true, "Couldn't set valid values");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.setDepth(6);
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testValidateFilter() {
TesseractOCRConfig config = new TesseractOCRConfig();
config.setFilter("Triangle");
config.setFilter("box");
- assertTrue("Couldn't set valid values", true);
- config.setFilter("abc");
+ assertTrue(true, "Couldn't set valid values");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.setFilter("abc");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testValidateResize() {
TesseractOCRConfig config = new TesseractOCRConfig();
config.setResize(200);
config.setResize(400);
- assertTrue("Couldn't set valid values", true);
- config.setResize(1000);
+ assertTrue(true, "Couldn't set valid values");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.setResize(1000);
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testDataPathCheck() {
TesseractOCRParser parser = new TesseractOCRParser();
- parser.setTessdataPath("blah\u0000deblah");
+ assertThrows(IllegalArgumentException.class, () -> {
+ parser.setTessdataPath("blah\u0000deblah");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testPathCheck() {
TesseractOCRParser parser = new TesseractOCRParser();
- parser.setTesseractPath("blah\u0000deblah");
+ assertThrows(IllegalArgumentException.class, () -> {
+ parser.setTesseractPath("blah\u0000deblah");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadOtherKey() {
TesseractOCRConfig config = new TesseractOCRConfig();
- config.addOtherTesseractConfig("bad bad", "bad");
-
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.addOtherTesseractConfig("bad bad", "bad");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadOtherValue() {
TesseractOCRConfig config = new TesseractOCRConfig();
- config.addOtherTesseractConfig("bad", "bad bad");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.addOtherTesseractConfig("bad", "bad bad");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadOtherValueSlash() {
TesseractOCRConfig config = new TesseractOCRConfig();
- config.addOtherTesseractConfig("bad", "bad\\bad");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.addOtherTesseractConfig("bad", "bad\\bad");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadOtherValueControl() {
TesseractOCRConfig config = new TesseractOCRConfig();
- config.addOtherTesseractConfig("bad", "bad\u0001bad");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.addOtherTesseractConfig("bad", "bad\u0001bad");
+ });
}
@Test
@@ -214,16 +234,20 @@ public class TesseractOCRConfigTest extends TikaTest {
config.addOtherTesseractConfig("good", "good");
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadLanguageCode() throws Exception {
TesseractOCRConfig tesseractOCRConfig = new TesseractOCRConfig();
- tesseractOCRConfig.setLanguage("kerplekistani");
+ assertThrows(IllegalArgumentException.class, () -> {
+ tesseractOCRConfig.setLanguage("kerplekistani");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadColorSpace() {
TesseractOCRConfig config = new TesseractOCRConfig();
- config.setColorspace("someth!ng");
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.setColorspace("someth!ng");
+ });
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
index a67fc17..cc03dab 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.ocr;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.io.InputStream;
@@ -30,8 +30,7 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -63,7 +62,7 @@ public class TesseractOCRParserTest extends TikaTest {
@Test
public void testInterwordSpacing() throws Exception {
- assumeTrue("can run OCR", canRun());
+ assumeTrue(canRun(), "can run OCR");
//default
String xml = getXML("testOCR_spacing.png", getMetadata(MediaType.image("png"))).xml;
@@ -101,7 +100,7 @@ public class TesseractOCRParserTest extends TikaTest {
@Test
public void confirmMultiPageTiffHandling() throws Exception {
- assumeTrue("can run OCR", canRun());
+ assumeTrue(canRun(), "can run OCR");
//tesseract should handle multipage tiffs by itself
//let's confirm that
String xml = getXML("testTIFF_multipage.tif", getMetadata(MediaType.image("tiff"))).xml;
@@ -110,7 +109,7 @@ public class TesseractOCRParserTest extends TikaTest {
@Test
public void confirmRuntimeSkipOCR() throws Exception {
- assumeTrue("can run OCR", canRun());
+ assumeTrue(canRun(), "can run OCR");
TesseractOCRConfig config = new TesseractOCRConfig();
config.setSkipOcr(true);
ParseContext context = new ParseContext();
@@ -167,11 +166,11 @@ public class TesseractOCRParserTest extends TikaTest {
TesseractOCRConfig tesseractOCRConfig =
((TesseractOCRParser) tesseractOCRParser).getDefaultConfig();
- Assert.assertEquals(241, tesseractOCRConfig.getTimeoutSeconds());
- Assert.assertEquals(TesseractOCRConfig.OUTPUT_TYPE.HOCR,
+ assertEquals(241, tesseractOCRConfig.getTimeoutSeconds());
+ assertEquals(TesseractOCRConfig.OUTPUT_TYPE.HOCR,
tesseractOCRConfig.getOutputType());
- Assert.assertEquals("ceb", tesseractOCRConfig.getLanguage());
- Assert.assertEquals(false, tesseractOCRConfig.isApplyRotation());
+ assertEquals("ceb", tesseractOCRConfig.getLanguage());
+ assertEquals(false, tesseractOCRConfig.isApplyRotation());
// assertContains("myspecial", tesseractOCRConfig.getTesseractPath());
}
}
@@ -216,10 +215,10 @@ public class TesseractOCRParserTest extends TikaTest {
assertNotNull(tesseractOCRParser);
TesseractOCRConfig tesseractOCRConfig =
((TesseractOCRParser) tesseractOCRParser).getDefaultConfig();
- Assert.assertEquals("0.75",
+ assertEquals("0.75",
tesseractOCRConfig.getOtherTesseractConfig().get("textord_initialx_ile"));
- Assert.assertEquals("0.15625",
+ assertEquals("0.15625",
tesseractOCRConfig.getOtherTesseractConfig().get("textord_noise_hfract"));
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java
index 866922e..381325e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java
@@ -16,10 +16,9 @@
*/
package org.apache.tika.parser.pdf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.exception.AccessPermissionException;
import org.apache.tika.metadata.AccessPermissions;
@@ -30,19 +29,16 @@ public class AccessCheckerTest {
@Test
public void testLegacy() throws AccessPermissionException {
-
+ //test that there are no thrown exceptions
Metadata m = getMetadata(false, false);
//legacy behavior; don't bother checking
AccessChecker checker = new AccessChecker();
checker.check(m);
- assertTrue("no exception", true);
m = getMetadata(false, true);
- assertTrue("no exception", true);
checker.check(m);
m = getMetadata(true, true);
- assertTrue("no exception", true);
checker.check(m);
}
@@ -59,7 +55,7 @@ public class AccessCheckerTest {
} catch (AccessPermissionException e) {
ex = true;
}
- assertTrue("correct exception with no extraction, no extract for accessibility", ex);
+ assertTrue(ex, "correct exception with no extraction, no extract for accessibility");
ex = false;
try {
//document allows extraction for accessibility
@@ -69,7 +65,7 @@ public class AccessCheckerTest {
//but application is not an accessibility application
ex = true;
}
- assertTrue("correct exception with no extraction, no extract for accessibility", ex);
+ assertTrue(ex, "correct exception with no extraction, no extract for accessibility");
}
@Test
@@ -78,7 +74,7 @@ public class AccessCheckerTest {
//allow accessibility
AccessChecker checker = new AccessChecker(true);
checker.check(m);
- assertTrue("no exception", true);
+ assertTrue(true, "no exception");
boolean ex = false;
try {
m = getMetadata(false, false);
@@ -86,7 +82,7 @@ public class AccessCheckerTest {
} catch (AccessPermissionException e) {
ex = true;
}
- assertTrue("correct exception", ex);
+ assertTrue(ex, "correct exception");
}
@Test
@@ -95,14 +91,14 @@ public class AccessCheckerTest {
//allow accessibility
AccessChecker checker = new AccessChecker(true);
checker.check(m);
- assertTrue("no exception", true);
+ assertTrue(true, "no exception");
//don't extract for accessibility
checker = new AccessChecker(false);
//if extract content is allowed, the checker shouldn't
//check the value of extract for accessibility
checker.check(m);
- assertTrue("no exception", true);
+ assertTrue(true, "no exception");
}
@@ -116,7 +112,7 @@ public class AccessCheckerTest {
} catch (PropertyTypeException e) {
ex = true;
}
- assertTrue("can't add multiple values", ex);
+ assertTrue(ex, "can't add multiple values");
m = new Metadata();
ex = false;
@@ -126,7 +122,7 @@ public class AccessCheckerTest {
} catch (PropertyTypeException e) {
ex = true;
}
- assertTrue("can't add multiple values", ex);
+ assertTrue(ex, "can't add multiple values");
}
private Metadata getMetadata(boolean allowExtraction, boolean allowExtractionForAccessibility) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java
index e80ae05..f508331 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.pdf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -33,7 +33,7 @@ public class PDFMarkedContent2XHTMLTest extends TikaTest {
static ParseContext MARKUP_CONTEXT = new ParseContext();
- @BeforeClass
+ @BeforeAll
public static void setUp() {
PDFParserConfig config = new PDFParserConfig();
config.setExtractMarkedContent(true);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
index b90a405..c1bbee1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.pdf;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.Arrays;
@@ -37,10 +37,10 @@ import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.pdfbox.rendering.ImageType;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.Tika;
@@ -75,14 +75,14 @@ public class PDFParserTest extends TikaTest {
public static Level PDFBOX_LOG_LEVEL = Level.INFO;
- @BeforeClass
+ @BeforeAll
public static void setup() {
//remember default logging level, but turn off for PDFParserTest
PDFBOX_LOG_LEVEL = Logger.getLogger("org.apache.pdfbox").getLevel();
Logger.getLogger("org.apache.pdfbox").setLevel(Level.OFF);
}
- @AfterClass
+ @AfterAll
public static void tearDown() {
//return to regular logging level
Logger.getLogger("org.apache.pdfbox").setLevel(PDFBOX_LOG_LEVEL);
@@ -123,10 +123,9 @@ public class PDFParserTest extends TikaTest {
assertContains("incubator", xml);
assertContains("Apache Software Foundation", xml);
// testing how the end of one paragraph is separated from start of the next one
- assertTrue("should have word boundary after headline",
- !xml.contains("ToolkitApache"));
- assertTrue("should have word boundary between paragraphs",
- !xml.contains("libraries.Apache"));
+ assertTrue(!xml.contains("ToolkitApache"), "should have word boundary after headline");
+ assertTrue(!xml.contains("libraries.Apache"),
+ "should have word boundary between paragraphs");
}
@Test
@@ -233,11 +232,11 @@ public class PDFParserTest extends TikaTest {
} catch (EncryptedDocumentException e) {
ex = true;
}
- assertTrue("encryption exception", ex);
+ assertTrue(ex, "encryption exception");
assertEquals("application/pdf", metadata.get(Metadata.CONTENT_TYPE));
assertEquals("true", metadata.get("pdf:encrypted"));
//pdf:encrypted, X-Parsed-By and Content-Type
- assertEquals("very little metadata should be parsed", 3, metadata.names().length);
+ assertEquals(3, metadata.names().length, "very little metadata should be parsed");
assertEquals(0, handler.toString().length());
}
@@ -587,7 +586,7 @@ public class PDFParserTest extends TikaTest {
assertEquals("true", m.get(PDF.HAS_XMP));
assertEquals("true", m.get(PDF.HAS_ACROFORM_FIELDS));
assertEquals("false", m.get(PDF.HAS_XFA));
- assertTrue("found", (result.xml.contains("<li>aTextField: TIKA-1226</li>")));
+ assertContains("<li>aTextField: TIKA-1226</li>", result.xml);
}
@Test
@@ -642,14 +641,14 @@ public class PDFParserTest extends TikaTest {
break;
}
}
- assertTrue("dc:format ::" + e.getValue(), foundDC);
+ assertTrue(foundDC, "dc:format ::" + e.getValue());
String extensionVersionTruth = pdfExtensionVersions.get(e.getKey());
if (extensionVersionTruth != null) {
- assertEquals("pdf:PDFExtensionVersion :: " + extensionVersionTruth,
- extensionVersionTruth, r.metadata.get("pdf:PDFExtensionVersion"));
+ assertEquals(extensionVersionTruth, r.metadata.get("pdf:PDFExtensionVersion"),
+ "pdf:PDFExtensionVersion :: " + extensionVersionTruth);
}
- assertEquals("pdf:PDFVersion", pdfVersions.get(e.getKey()),
- r.metadata.get("pdf:PDFVersion"));
+ assertEquals(pdfVersions.get(e.getKey()),
+ r.metadata.get("pdf:PDFVersion"), "pdf:PDFVersion");
}
//now test full 11.x
XMLResult r = getXML("testPDF_Version.11.x.PDFA-1b.pdf");
@@ -658,11 +657,11 @@ public class PDFParserTest extends TikaTest {
for (String hit : new String[]{"application/pdf; version=1.7",
"application/pdf; version=\"A-1b\"",
"application/pdf; version=\"1.7 Adobe Extension Level 8\""}) {
- assertTrue(hit, versions.contains(hit));
+ assertTrue(versions.contains(hit), hit);
}
- assertEquals("pdfaid:conformance", r.metadata.get("pdfaid:conformance"), "B");
- assertEquals("pdfaid:part", r.metadata.get("pdfaid:part"), "1");
+ assertEquals(r.metadata.get("pdfaid:conformance"), "B", "pdfaid:conformance");
+ assertEquals(r.metadata.get("pdfaid:part"), "1", "pdfaid:part");
}
@Test
@@ -785,10 +784,10 @@ public class PDFParserTest extends TikaTest {
@Test //TIKA-1376
public void testEmbeddedFileNameExtraction() throws Exception {
List<Metadata> metadatas = getRecursiveMetadata("testPDF_multiFormatEmbFiles.pdf");
- assertEquals("metadata size", 5, metadatas.size());
+ assertEquals(5, metadatas.size());
Metadata firstAttachment = metadatas.get(1);
- assertEquals("attachment file name", "Test.txt",
- firstAttachment.get(TikaCoreProperties.RESOURCE_NAME_KEY));
+ assertEquals("Test.txt", firstAttachment.get(TikaCoreProperties.RESOURCE_NAME_KEY),
+ "attachment file name");
}
@Test //TIKA-1427
@@ -1036,7 +1035,7 @@ public class PDFParserTest extends TikaTest {
tikaEx = true;
}
String content = handler.toString();
- assertTrue("Should have thrown exception", tikaEx);
+ assertTrue(tikaEx, "Should have thrown exception");
assertEquals(1, m.getValues(TikaCoreProperties.TIKA_META_EXCEPTION_WARNING).length);
assertContains("Unknown dir", m.get(TikaCoreProperties.TIKA_META_EXCEPTION_WARNING));
assertContains("1309.61", content);
@@ -1055,7 +1054,7 @@ public class PDFParserTest extends TikaTest {
tikaEx = true;
}
content = handler.toString();
- assertTrue("Should have thrown exception", tikaEx);
+ assertTrue(tikaEx, "Should have thrown exception");
assertEquals(0, m.getValues(TikaCoreProperties.TIKA_META_EXCEPTION_WARNING).length);
assertNotContained("1309.61", content);
}
@@ -1179,11 +1178,11 @@ public class PDFParserTest extends TikaTest {
String text = getText(is, parser, context);
noEx = true;
} catch (Exception e) {
- assertEquals("Not the right exception: " + path, expected, e.getClass());
+ assertEquals(expected, e.getClass(), "Not the right exception: " + path);
} finally {
IOUtils.closeQuietly(is);
}
- assertFalse(path + " should have thrown exception", noEx);
+ assertFalse(noEx, path + " should have thrown exception");
}
@Test
@@ -1248,7 +1247,7 @@ public class PDFParserTest extends TikaTest {
}
@Test //TIKA-3041
- @Ignore("turn back on if we add file from PDFBOX-52")
+ @Disabled("turn back on if we add file from PDFBOX-52")
public void testPDFBox52() throws Exception {
PDFParserConfig config = new PDFParserConfig();
config.setExtractInlineImages(true);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
index 9785560..5875546 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -44,7 +44,7 @@ public abstract class AbstractPkgTest extends TikaTest {
protected EmbeddedTrackingParser tracker;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tracker = new EmbeddedTrackingParser();
trackingContext = new ParseContext();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
index 13d6c10..457eff0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
@@ -17,13 +17,13 @@
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
@@ -52,7 +52,7 @@ public class ArParserTest extends AbstractPkgTest {
assertEquals("testTXT.txt", tracker.filenames.get(0));
String modifiedAt = tracker.modifiedAts.get(0);
- assertTrue("Modified at " + modifiedAt, modifiedAt.startsWith("201"));
+ assertTrue(modifiedAt.startsWith("201"), "Modified at " + modifiedAt);
for (String type : tracker.mediatypes) {
assertNull(type);
@@ -72,7 +72,7 @@ public class ArParserTest extends AbstractPkgTest {
assertEquals("testAU.au", tracker.filenames.get(0));
modifiedAt = tracker.modifiedAts.get(0);
- assertTrue("Modified at " + modifiedAt, modifiedAt.startsWith("201"));
+ assertTrue(modifiedAt.startsWith("201"), "Modified at " + modifiedAt);
for (String type : tracker.mediatypes) {
assertNull(type);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
index 9a8687b..a4e22cf 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.pkg;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
index dd62210..97c64d3 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
@@ -17,12 +17,12 @@
package org.apache.tika.parser.pkg;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.exception.TikaMemoryLimitException;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
index 51a55f8..e793fb0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
@@ -18,15 +18,16 @@
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.util.HashSet;
import java.util.Set;
import org.apache.commons.compress.compressors.CompressorStreamFactory;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.detect.zip.CompressorConstants;
@@ -39,7 +40,7 @@ public class CompressorParserTest extends TikaTest {
//be detected.
private static Set<MediaType> NOT_COVERED = new HashSet();
- @BeforeClass
+ @BeforeAll
public static void setUp() {
NOT_COVERED.add(MediaType.application("x-lz4-block"));
NOT_COVERED.add(MediaType.application("x-snappy-raw"));
@@ -71,20 +72,22 @@ public class CompressorParserTest extends TikaTest {
}
}
- @Test(expected = TikaException.class)
+ @Test
public void testQuineXHTML() throws Exception {
//Anti-virus can surreptitiously remove this file
- Assume.assumeTrue(
+ assumeTrue(
CompressorParserTest.class.getResourceAsStream("/test-documents/quine.gz") != null);
//https://blog.matthewbarber.io/2019/07/22/how-to-make-compressed-file-quines
- getXML("quine.gz");
+ assertThrows(TikaException.class, () -> {
+ getXML("quine.gz");
+ });
}
@Test
public void testQuineRecursive() throws Exception {
//Anti-virus can surreptitiously remove this file
- Assume.assumeTrue(
+ assumeTrue(
CompressorParserTest.class.getResourceAsStream("/test-documents/quine.gz") != null);
//https://blog.matthewbarber.io/2019/07/22/how-to-make-compressed-file-quines
getRecursiveMetadata("quine.gz");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
index bc17076..99f1242 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.pkg;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
index d2ef25e..d8dacb2 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
@@ -17,17 +17,16 @@
package org.apache.tika.parser.pkg;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -77,8 +76,8 @@ public class PackageParserTest extends TikaTest {
}
}
for (MediaType mediaType : currentSpecializations) {
- assertTrue("missing: " + mediaType,
- PackageParser.PACKAGE_SPECIALIZATIONS.contains(mediaType));
+ assertTrue(PackageParser.PACKAGE_SPECIALIZATIONS.contains(mediaType),
+ "missing: " + mediaType);
}
assertEquals(currentSpecializations.size(), PackageParser.PACKAGE_SPECIALIZATIONS.size());
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
index a49934d..e76c90f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.exception.EncryptedDocumentException;
@@ -77,7 +77,7 @@ public class RarParserTest extends AbstractPkgTest {
}
for (String mod : tracker.modifiedAts) {
assertNotNull(mod);
- assertTrue("Modified at " + mod, mod.startsWith("20"));
+ assertTrue(mod.startsWith("20"), "Modified at " + mod);
}
// Should have filenames in the content string
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
index 1aead31..1afce70 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
@@ -69,7 +69,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
}
for (String mod : tracker.modifiedAts) {
assertNotNull(mod);
- assertTrue("Modified at " + mod, mod.startsWith("20"));
+ assertTrue(mod.startsWith("20"), "Modified at " + mod);
}
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
index 1749858..81e9932 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
@@ -72,7 +72,7 @@ public class TarParserTest extends AbstractPkgTest {
}
for (String mod : tracker.modifiedAts) {
assertNotNull(mod);
- assertTrue("Modified at " + mod, mod.startsWith("20"));
+ assertTrue(mod.startsWith("20"), "Modified at " + mod);
}
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
index 287745d..9bc183b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.DefaultHandler;
@@ -79,7 +80,7 @@ public class ZipParserTest extends AbstractPkgTest {
}
for (String mod : tracker.modifiedAts) {
assertNotNull(mod);
- assertTrue("Modified at " + mod, mod.startsWith("20"));
+ assertTrue(mod.startsWith("20"), "Modified at " + mod);
}
}
@@ -118,7 +119,7 @@ public class ZipParserTest extends AbstractPkgTest {
@Test
public void testQuineRecursiveParserWrapper() throws Exception {
//Anti-virus can surreptitiously remove this file
- Assume.assumeTrue(
+ assumeTrue(
ZipParserTest.class.getResourceAsStream("/test-documents/droste.zip") != null);
//received permission from author via dm
//2019-07-25 to include
@@ -128,12 +129,14 @@ public class ZipParserTest extends AbstractPkgTest {
getRecursiveMetadata("droste.zip");
}
- @Test(expected = TikaException.class)
- public void testQuine() throws Exception {
+ @Test
+ public void testQuine() {
//Anti-virus can surreptitiously remove this file
- Assume.assumeTrue(
+ assumeTrue(
ZipParserTest.class.getResourceAsStream("/test-documents/droste.zip") != null);
- getXML("droste.zip");
+ assertThrows(TikaException.class, () -> {
+ getXML("droste.zip");
+ });
}
@Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
index 2508fce..d303628 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java
index 7f5735a..2f3ba44 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.parser.csv;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -28,7 +28,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.mime.MediaType;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java
index 901a193..ea1b919 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.csv;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -27,8 +27,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.ByteOrderMark;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -66,7 +66,7 @@ public class TextAndCSVParserTest extends TikaTest {
private static Parser PARSER;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
try (InputStream is = Thread.currentThread().getContextClassLoader()
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
index 09a47fe..36c8b01 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
@@ -19,13 +19,13 @@ package org.apache.tika.parser.strings;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_16;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java
index fd534a3..1e59710 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.tika.parser.strings;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.parser.CompositeParser;
@@ -30,10 +31,10 @@ public class StringsConfigTest {
@Test
public void testNoConfig() {
StringsConfig config = new StringsConfig();
- assertEquals("Invalid default encoding value", StringsEncoding.SINGLE_7_BIT,
- config.getEncoding());
- assertEquals("Invalid default min-len value", 4, config.getMinLength());
- assertEquals("Invalid default timeout value", 120, config.getTimeoutSeconds());
+ assertEquals(StringsEncoding.SINGLE_7_BIT, config.getEncoding(),
+ "Invalid default encoding value");
+ assertEquals(4, config.getMinLength(), "Invalid default min-len value");
+ assertEquals(120, config.getTimeoutSeconds(), "Invalid default timeout value");
}
@Test
@@ -48,10 +49,10 @@ public class StringsConfigTest {
(StringsParser) ((CompositeParser) tikaConfig.getParser()).getAllComponentParsers()
.get(0);
- assertEquals("Invalid overridden encoding value", StringsEncoding.BIGENDIAN_16_BIT,
- p.getStringsEncoding());
- assertEquals("Invalid default min-len value", 4, p.getMinLength());
- assertEquals("Invalid overridden timeout value", 60, p.getTimeoutSeconds());
+ assertEquals(StringsEncoding.BIGENDIAN_16_BIT, p.getStringsEncoding(),
+ "Invalid overridden encoding value");
+ assertEquals(4, p.getMinLength(), "Invalid default min-len value");
+ assertEquals(60, p.getTimeoutSeconds(), "Invalid overridden timeout value");
}
@Test
@@ -65,16 +66,18 @@ public class StringsConfigTest {
StringsParser p =
(StringsParser) ((CompositeParser) tikaConfig.getParser()).getAllComponentParsers()
.get(0);
- assertEquals("Invalid overridden encoding value", StringsEncoding.BIGENDIAN_16_BIT,
- p.getStringsEncoding());
- assertEquals("Invalid overridden min-len value", 3, p.getMinLength());
- assertEquals("Invalid overridden timeout value", 60, p.getTimeoutSeconds());
+ assertEquals(StringsEncoding.BIGENDIAN_16_BIT, p.getStringsEncoding(),
+ "Invalid overridden encoding value");
+ assertEquals(3, p.getMinLength(), "Invalid overridden min-len value");
+ assertEquals(60, p.getTimeoutSeconds(), "Invalid overridden timeout value");
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testValidateEconding() {
StringsConfig config = new StringsConfig();
- config.setMinLength(0);
+ assertThrows(IllegalArgumentException.class, () -> {
+ config.setMinLength(0);
+ });
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
index 31d3629..360fb44 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
@@ -17,14 +17,14 @@
package org.apache.tika.parser.strings;
import static org.apache.tika.parser.strings.StringsParser.getStringsProg;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.config.Initializable;
@@ -68,7 +68,7 @@ public class StringsParserTest {
// Content
for (String word : content) {
- assertTrue("can't find " + word, handler.toString().contains(word));
+ assertTrue(handler.toString().contains(word), "can't find " + word);
}
// Metadata
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
index 8441910..74f9b68 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser.txt;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -26,7 +26,7 @@ import java.io.InputStream;
import java.io.Reader;
import java.nio.file.Files;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
index 5ed7666..576d6f6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
@@ -18,13 +18,13 @@ package org.apache.tika.parser.txt;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.ByteArrayInputStream;
import java.io.StringWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.DefaultHandler;
@@ -190,7 +190,7 @@ public class TXTParserTest extends TikaTest {
};
Metadata metadata = new Metadata();
parser.parse(new ByteArrayInputStream(input), handler, metadata, new ParseContext());
- assertEquals(msg, expected, handler.toString());
+ assertEquals(expected, handler.toString(), msg);
}
/**
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
index 4ccee60..7403126 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.xliff;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java
index a57e403..350b12e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.xliff;
import static org.apache.tika.TikaTest.assertContains;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
index c4070f8..94af7d6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.parser.xml;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.DefaultHandler;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
index c223e18..c869c04 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.xml;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
index 5526563..01db2f9 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
@@ -20,7 +20,7 @@ import static org.apache.tika.TikaTest.assertContains;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/TextAndAttributeXMLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/TextAndAttributeXMLParserTest.java
index 9f9aede..7b7578e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/TextAndAttributeXMLParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/TextAndAttributeXMLParserTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.xml;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
index 76364cb..c131970 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser.xmp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.io.InputStream;
@@ -25,7 +25,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java
index 993356d..2ed4c35 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.detect.zip;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.HttpHeaders;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml
index cab8b14..96cc59a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml
@@ -185,11 +185,6 @@
<!-- integration test jars -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>${zstd.version}</version>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
index cb4792e..fc573a8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.detect.CompositeDetector;
import org.apache.tika.detect.DefaultDetector;
@@ -39,6 +39,7 @@ import org.apache.tika.parser.microsoft.pst.OutlookPSTParser;
* full set of detectors
*/
public class TikaDetectorConfigTest extends AbstractTikaConfigTest {
+
@Test
public void testDetectorExcludeFromDefault() throws Exception {
TikaConfig config = getConfig("TIKA-1702-detector-exclude.xml");
@@ -99,10 +100,10 @@ public class TikaDetectorConfigTest extends AbstractTikaConfigTest {
// Check that both detectors have a mimetypes with entries
- assertTrue("Not enough mime types: " + configWX.getMediaTypeRegistry().getTypes().size(),
- configWX.getMediaTypeRegistry().getTypes().size() > 100);
- assertTrue("Not enough mime types: " + configCL.getMediaTypeRegistry().getTypes().size(),
- configCL.getMediaTypeRegistry().getTypes().size() > 100);
+ assertTrue(configWX.getMediaTypeRegistry().getTypes().size() > 100,
+ "Not enough mime types: " + configWX.getMediaTypeRegistry().getTypes().size());
+ assertTrue(configCL.getMediaTypeRegistry().getTypes().size() > 100,
+ "Not enough mime types: " + configCL.getMediaTypeRegistry().getTypes().size());
// Now check they detect PST files correctly
@@ -139,10 +140,10 @@ public class TikaDetectorConfigTest extends AbstractTikaConfigTest {
}
}
if (shouldHavePOIFS) {
- assertTrue("Should have the POIFSContainerDetector", hasPOIFS);
+ assertTrue(hasPOIFS, "Should have the POIFSContainerDetector");
}
if (shouldHaveZip) {
- assertTrue("Should have the ZipContainerDetector", hasZip);
+ assertTrue(hasZip, "Should have the ZipContainerDetector");
}
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
index f1d884b..3c206fa 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
@@ -17,9 +17,10 @@
package org.apache.tika.config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -29,7 +30,7 @@ import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.detect.CompositeEncodingDetector;
@@ -155,11 +156,13 @@ public class TikaEncodingDetectorTest extends AbstractTikaConfigTest {
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testNonDetectingDetectorParamsBadCharset() throws Exception {
try (InputStream is = getResourceAsStream(
"/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml")) {
- TikaConfig tikaConfig = new TikaConfig(is);
+ assertThrows(TikaConfigException.class, () -> {
+ TikaConfig tikaConfig = new TikaConfig(is);
+ });
}
}
@@ -214,14 +217,17 @@ public class TikaEncodingDetectorTest extends AbstractTikaConfigTest {
for (EncodingDetector childEncodingDetector :
((CompositeEncodingDetector) encodingDetector).getDetectors()) {
if (childEncodingDetector instanceof HtmlEncodingDetector) {
- assertEquals(childParser.getClass().toString(), 64000,
- ((HtmlEncodingDetector) childEncodingDetector).getMarkLimit());
+ assertEquals(64000,
+ ((HtmlEncodingDetector) childEncodingDetector).getMarkLimit(),
+ childParser.getClass().toString());
} else if (childEncodingDetector instanceof UniversalEncodingDetector) {
- assertEquals(childParser.getClass().toString(), 64001,
- ((UniversalEncodingDetector) childEncodingDetector).getMarkLimit());
+ assertEquals(64001,
+ ((UniversalEncodingDetector) childEncodingDetector).getMarkLimit(),
+ childParser.getClass().toString());
} else if (childEncodingDetector instanceof Icu4jEncodingDetector) {
- assertEquals(childParser.getClass().toString(), 64002,
- ((Icu4jEncodingDetector) childEncodingDetector).getMarkLimit());
+ assertEquals(64002,
+ ((Icu4jEncodingDetector) childEncodingDetector).getMarkLimit(),
+ childParser.getClass().toString());
}
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaParserConfigTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
index 9f8193c..12e172e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.CompositeParser;
@@ -40,6 +40,7 @@ import org.apache.tika.parser.xml.XMLParser;
* full set of parsers
*/
public class TikaParserConfigTest extends AbstractTikaConfigTest {
+
@Test
public void testMimeExcludeInclude() throws Exception {
TikaConfig config = getConfig("TIKA-1558-exclude.xml");
@@ -144,7 +145,7 @@ public class TikaParserConfigTest extends AbstractTikaConfigTest {
break;
}
}
- assertTrue("Default config should include an XMLParser.", hasXML);
+ assertTrue(hasXML, "Default config should include an XMLParser.");
// This custom TikaConfig should exclude XMLParser and all of its subclasses.
config = getConfig("TIKA-1558-excludesub.xml");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
index 70c0613..234d4ea 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
@@ -16,10 +16,11 @@
*/
package org.apache.tika.config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.exception.TikaConfigException;
import org.apache.tika.language.translate.DefaultTranslator;
@@ -31,6 +32,7 @@ import org.apache.tika.language.translate.EmptyTranslator;
* full set of translators
*/
public class TikaTranslatorConfigTest extends AbstractTikaConfigTest {
+
@Test
public void testDefaultBehaviour() throws Exception {
TikaConfig config = TikaConfig.getDefaultConfig();
@@ -62,13 +64,10 @@ public class TikaTranslatorConfigTest extends AbstractTikaConfigTest {
* Currently, Translators don't support Composites, so
* if multiple translators are given, throw a TikaConfigException
*/
- @Test(expected = TikaConfigException.class)
+ @Test
public void testRequestsMultiple() throws Exception {
- TikaConfig config = getConfig("TIKA-1702-translator-empty-default.xml");
- assertNotNull(config.getParser());
- assertNotNull(config.getDetector());
- assertNotNull(config.getTranslator());
-
- assertEquals(EmptyTranslator.class, config.getTranslator().getClass());
+ assertThrows(TikaConfigException.class, () -> {
+ TikaConfig config = getConfig("TIKA-1702-translator-empty-default.xml");
+ });
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
index 9510a2c..e1754ea 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.detect;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileFilter;
@@ -29,9 +29,9 @@ import java.util.Objects;
import java.util.Random;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.MultiThreadedTikaTest;
import org.apache.tika.Tika;
@@ -59,7 +59,7 @@ public class TestContainerAwareDetector extends MultiThreadedTikaTest {
private final StreamingZipContainerDetector streamingZipDetector =
new StreamingZipContainerDetector();
- @After
+ @AfterEach
public void tearDown() throws TikaException {
//make sure to reset pool size because it is being randomly resized during the tests
XMLReaderUtils.setPoolSize(10);
@@ -104,8 +104,8 @@ public class TestContainerAwareDetector extends MultiThreadedTikaTest {
if (mediaTypeRegistry.isSpecializationOf(expected, MediaType.APPLICATION_ZIP) &&
!expected.toString().contains("tika-ooxml-protected")) {
- assertEquals("streaming zip detector failed", expected,
- streamingZipDetector.detect(stream, m));
+ assertEquals(expected, streamingZipDetector.detect(stream, m),
+ "streaming zip detector failed");
}
}
}
@@ -378,7 +378,7 @@ public class TestContainerAwareDetector extends MultiThreadedTikaTest {
}
@Test
- @Ignore("TODO -- fix this")
+ @Disabled("TODO -- fix this")
public void testDetectIWork2013() throws Exception {
assertTypeByData("testKeynote2013.key",
IWork13PackageParser.IWork13DocumentType.KEYNOTE13.getType().toString());
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestDetectorLoading.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestDetectorLoading.java
index fd4bcd7..27f6b22 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestDetectorLoading.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestDetectorLoading.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.detect;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java
index 97eb7f6..0fb50e2 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/detect/TestFileCommandDetector.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.detect;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.io.FileFilter;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.MultiThreadedTikaTest;
import org.apache.tika.utils.XMLReaderUtils;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
index 3b34b2c..01ebb50 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
@@ -17,7 +17,7 @@
package org.apache.tika.extractor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.parser.EmptyParser;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypeTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypeTest.java
index fd04c89..5c68aa9 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypeTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypeTest.java
@@ -16,19 +16,19 @@
*/
package org.apache.tika.mime;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class MimeTypeTest {
private MimeTypes types;
private MimeType text;
- @Before
+ @BeforeEach
public void setUp() throws MimeTypeException {
types = new MimeTypes();
text = types.forName("text/plain");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypesTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypesTest.java
index 41db543..8e8d273 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypesTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/MimeTypesTest.java
@@ -18,15 +18,15 @@ package org.apache.tika.mime;
import static org.apache.tika.mime.MediaType.OCTET_STREAM;
import static org.apache.tika.mime.MediaType.TEXT_PLAIN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class MimeTypesTest {
@@ -40,7 +40,7 @@ public class MimeTypesTest {
private MimeType html;
- @Before
+ @BeforeEach
public void setUp() throws MimeTypeException {
types = new MimeTypes();
registry = types.getMediaTypeRegistry();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index 5b6bae0..0a9e0ef 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -16,14 +16,12 @@
*/
package org.apache.tika.mime;
-// Junit imports
-
import static java.nio.charset.StandardCharsets.UTF_16BE;
import static java.nio.charset.StandardCharsets.UTF_16LE;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -31,8 +29,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
@@ -50,7 +48,7 @@ public class TestMimeTypes {
private MimeTypes repo;
private URL u;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
TikaConfig config = TikaConfig.getDefaultConfig();
repo = config.getMimeRepository();
@@ -1262,7 +1260,7 @@ public class TestMimeTypes {
private void assertType(String expected, String filename) throws Exception {
try (InputStream stream = TikaInputStream
.get(TestMimeTypes.class.getResourceAsStream("/test-documents/" + filename))) {
- assertNotNull("Test file not found: " + filename, stream);
+ assertNotNull(stream, "Test file not found: " + filename);
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
assertEquals(expected, repo.detect(stream, metadata).toString());
@@ -1278,7 +1276,7 @@ public class TestMimeTypes {
private void assertTypeByData(String expected, String filename) throws IOException {
try (InputStream stream = TikaInputStream
.get(TestMimeTypes.class.getResourceAsStream("/test-documents/" + filename))) {
- assertNotNull("Test file not found: " + filename, stream);
+ assertNotNull(stream, "Test file not found: " + filename);
Metadata metadata = new Metadata();
assertEquals(expected, repo.detect(stream, metadata).toString());
}
@@ -1309,7 +1307,7 @@ public class TestMimeTypes {
private MediaType getTypeByNameAndData(String filename) throws IOException {
try (InputStream stream = TikaInputStream
.get(TestMimeTypes.class.getResourceAsStream("/test-documents/" + filename))) {
- assertNotNull("Test document not found: " + filename, stream);
+ assertNotNull(stream, "Test document not found: " + filename);
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
return repo.detect(stream, metadata);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
index effec6c..7387c11 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
@@ -17,10 +17,10 @@
package org.apache.tika.parser;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,7 +34,7 @@ import java.util.zip.ZipOutputStream;
import org.gagravarr.tika.FlacParser;
import org.gagravarr.tika.OpusParser;
import org.gagravarr.tika.VorbisParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -95,12 +95,12 @@ public class AutoDetectParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
new AutoDetectParser(tika).parse(input, handler, metadata);
- assertEquals("Bad content type: " + tp, tp.realType,
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(tp.realType, metadata.get(Metadata.CONTENT_TYPE),
+ "Bad content type: " + tp);
if (tp.expectedContentFragment != null) {
- assertTrue("Expected content not found: " + tp,
- handler.toString().contains(tp.expectedContentFragment));
+ assertTrue(handler.toString().contains(tp.expectedContentFragment),
+ "Expected content not found: " + tp);
}
}
}
@@ -303,23 +303,23 @@ public class AutoDetectParserTest extends TikaTest {
// Check we can load the parsers, and they claim to do the right things
VorbisParser vParser = new VorbisParser();
- assertNotNull("Parser not found for " + mediaTypes[0],
- vParser.getSupportedTypes(new ParseContext()));
+ assertNotNull(vParser.getSupportedTypes(new ParseContext()),
+ "Parser not found for " + mediaTypes[0]);
FlacParser fParser = new FlacParser();
- assertNotNull("Parser not found for " + mediaTypes[1],
- fParser.getSupportedTypes(new ParseContext()));
- assertNotNull("Parser not found for " + mediaTypes[2],
- fParser.getSupportedTypes(new ParseContext()));
+ assertNotNull(fParser.getSupportedTypes(new ParseContext()),
+ "Parser not found for " + mediaTypes[1]);
+ assertNotNull(fParser.getSupportedTypes(new ParseContext()),
+ "Parser not found for " + mediaTypes[2]);
OpusParser oParser = new OpusParser();
- assertNotNull("Parser not found for " + mediaTypes[3],
- oParser.getSupportedTypes(new ParseContext()));
+ assertNotNull(oParser.getSupportedTypes(new ParseContext()),
+ "Parser not found for " + mediaTypes[3]);
// Check we found the parser
CompositeParser parser = (CompositeParser) tika.getParser();
for (MediaType mt : mediaTypes) {
- assertNotNull("Parser not found for " + mt, parser.getParsers().get(mt));
+ assertNotNull(parser.getParsers().get(mt), "Parser not found for " + mt);
}
// Have each file parsed, and check
@@ -333,8 +333,8 @@ public class AutoDetectParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler();
new AutoDetectParser(tika).parse(input, handler, metadata);
- assertEquals("Incorrect content type for " + file, mediaTypes[i].toString(),
- metadata.get(Metadata.CONTENT_TYPE));
+ assertEquals(mediaTypes[i].toString(), metadata.get(Metadata.CONTENT_TYPE),
+ "Incorrect content type for " + file);
// Check some of the common metadata
// Old style metadata
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
index b64ae8c..4aba9b8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -48,7 +48,8 @@ public class AutoDetectReaderParserTest extends MultiThreadedTikaTest {
for (int i = 0; i < numThreads; i++) {
contexts[i] = new ParseContext();
}
- FileFilter fileFilter = pathname -> pathname.getName().endsWith(".txt") || pathname.getName().endsWith(".html");
+ FileFilter fileFilter = pathname -> pathname.getName().endsWith(".txt")
+ || pathname.getName().endsWith(".html");
testMultiThreaded(AUTO_DETECT_PARSER, contexts, numThreads, numIterations, fileFilter);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
index 96c6bed..474ba77 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -34,7 +35,7 @@ import java.util.Random;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.io.TikaInputStream;
@@ -76,7 +77,7 @@ public class BouncyCastleDigestingParserTest extends TikaTest {
XMLResult xml = getXML("test_recursive_embedded.docx",
new DigestingParser(AUTO_DETECT_PARSER,
new BouncyCastleDigester(UNLIMITED, algo)), m);
- assertEquals(algo, expected.get(algo), m.get(P + algo));
+ assertEquals(expected.get(algo), m.get(P + algo));
}
}
@@ -106,7 +107,7 @@ public class BouncyCastleDigestingParserTest extends TikaTest {
new DigestingParser(AUTO_DETECT_PARSER, new BouncyCastleDigester(UNLIMITED,
"MD5,SHA256,SHA384,SHA512,SHA3-512,SHA1:32")), m);
for (String algo : new String[]{"MD5", "SHA256", "SHA384", "SHA512", "SHA3-512", "SHA1"}) {
- assertEquals(algo, expected.get(algo), m.get(P + algo));
+ assertEquals(expected.get(algo), m.get(P + algo));
}
assertNull(m.get(P + "MD2"));
@@ -122,16 +123,20 @@ public class BouncyCastleDigestingParserTest extends TikaTest {
assertEquals(expectedMD5, m.get(P + "MD5"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testNegativeMaxMarkLength() throws Exception {
- getXML("test_recursive_embedded.docx",
- new DigestingParser(AUTO_DETECT_PARSER, new BouncyCastleDigester(-1, "MD5")));
+ assertThrows(IllegalArgumentException.class, () -> {
+ getXML("test_recursive_embedded.docx",
+ new DigestingParser(AUTO_DETECT_PARSER, new BouncyCastleDigester(-1, "MD5")));
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testUnrecognizedEncodingOptions() throws Exception {
- getXML("test_recursive_embedded.docx", new DigestingParser(AUTO_DETECT_PARSER,
- new BouncyCastleDigester(100000, "MD5:33")));
+ assertThrows(IllegalArgumentException.class, () -> {
+ getXML("test_recursive_embedded.docx", new DigestingParser(AUTO_DETECT_PARSER,
+ new BouncyCastleDigester(100000, "MD5:33")));
+ });
}
@Test
@@ -214,9 +219,10 @@ public class BouncyCastleDigestingParserTest extends TikaTest {
assertNotNull("truth", truthValue);
assertNotNull("result (fileLength=" + fileLength + ", markLimit=" + markLimit + ")",
resultValue);
- assertEquals("fileLength(" + fileLength + ") markLimit(" + markLimit +
- ") useTikaInputStream(" + useTikaInputStream + ") " + "algorithm(" + algo +
- ") seed(" + SEED + ")", truthValue, resultValue);
+ assertEquals(truthValue, resultValue,
+ "fileLength(" + fileLength + ") markLimit(" + markLimit +
+ ") useTikaInputStream(" + useTikaInputStream + ") " + "algorithm(" + algo +
+ ") seed(" + SEED + ")");
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/DigestingParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/DigestingParserTest.java
index d5c24c1..2a377c7 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/DigestingParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/DigestingParserTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -34,7 +34,7 @@ import java.util.Map;
import java.util.Random;
import org.apache.commons.codec.digest.DigestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.io.TikaInputStream;
@@ -77,7 +77,7 @@ public class DigestingParserTest extends TikaTest {
XMLResult xml = getXML("test_recursive_embedded.docx",
new DigestingParser(AUTO_DETECT_PARSER, new CommonsDigester(UNLIMITED, algo)),
m);
- assertEquals(algo.toString(), expected.get(algo), m.get(P + algo.toString()));
+ assertEquals(expected.get(algo), m.get(P + algo.toString()), algo.toString());
}
}
@@ -108,7 +108,7 @@ public class DigestingParserTest extends TikaTest {
CommonsDigester.DigestAlgorithm.MD5, CommonsDigester.DigestAlgorithm.SHA1,
CommonsDigester.DigestAlgorithm.SHA256, CommonsDigester.DigestAlgorithm.SHA384,
CommonsDigester.DigestAlgorithm.SHA512}) {
- assertEquals(algo.toString(), expected.get(algo), m.get(P + algo.toString()));
+ assertEquals(expected.get(algo), m.get(P + algo.toString()), algo.toString());
}
assertNull(m.get(P + CommonsDigester.DigestAlgorithm.MD2.toString()));
@@ -135,7 +135,7 @@ public class DigestingParserTest extends TikaTest {
} catch (IllegalArgumentException e) {
ex = true;
}
- assertTrue("Exception not thrown", ex);
+ assertTrue(ex, "Exception not thrown");
}
@Test
@@ -224,12 +224,13 @@ public class DigestingParserTest extends TikaTest {
for (CommonsDigester.DigestAlgorithm algo : algos) {
String truthValue = truth.get(P + algo.name());
String resultValue = result.get(P + algo.name());
- assertNotNull("truth", truthValue);
- assertNotNull("result (fileLength=" + fileLength + ", markLimit=" + markLimit + ")",
- resultValue);
- assertEquals("fileLength(" + fileLength + ") markLimit(" + markLimit +
- ") useTikaInputStream(" + useTikaInputStream + ") " + "algorithm(" +
- algo.name() + ") seed(" + SEED + ")", truthValue, resultValue);
+ assertNotNull(truthValue, "truth");
+ assertNotNull(resultValue,
+ "result (fileLength=" + fileLength + ", markLimit=" + markLimit + ")");
+ assertEquals(truthValue, resultValue,
+ "fileLength(" + fileLength + ") markLimit(" + markLimit +
+ ") useTikaInputStream(" + useTikaInputStream + ") " + "algorithm(" +
+ algo.name() + ") seed(" + SEED + ")");
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ParsingReaderTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
index e954a21..bded9cf 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
@@ -17,13 +17,13 @@
package org.apache.tika.parser;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.Reader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
index 86915c5..9cd9346 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.io.InputStream;
@@ -31,7 +31,7 @@ import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.ClosedInputStream;
import org.apache.commons.io.input.ProxyInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -255,7 +255,7 @@ public class RecursiveParserWrapperTest extends TikaTest {
} finally {
IOUtils.closeQuietly(stream);
}
- assertTrue("npe", npe);
+ assertTrue(npe, "npe");
List<Metadata> metadataList = handler.getMetadataList();
assertEquals(2, metadataList.size());
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TabularFormatsTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
index 002d261..902a172 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.parser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.text.DateFormatSymbols;
import java.util.ArrayList;
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -174,8 +174,8 @@ public class TabularFormatsTest extends TikaTest {
String[] cells = toCells(hRow, isTH);
// Check we got the right number
- assertEquals("Wrong number of cells in header row " + hRow, columnLabels.length,
- cells.length);
+ assertEquals(columnLabels.length, cells.length,
+ "Wrong number of cells in header row " + hRow);
// Check we got the right stuff
for (int i = 0; i < cells.length; i++) {
@@ -207,14 +207,15 @@ public class TabularFormatsTest extends TikaTest {
// Check we got the right number of rows
for (int cn = 0; cn < table.length; cn++) {
- assertEquals("Wrong number of rows found compared to column " + (cn + 1),
- table[cn].length, rows.length);
+ assertEquals(table[cn].length, rows.length,
+ "Wrong number of rows found compared to column " + (cn + 1));
}
// Check each row's values
for (int rn = 0; rn < rows.length; rn++) {
String[] cells = toCells(rows[rn], false);
- assertEquals("Wrong number of values in row " + (rn + 1), table.length, cells.length);
+ assertEquals(table.length, cells.length,
+ "Wrong number of values in row " + (rn + 1));
for (int cn = 0; cn < table.length; cn++) {
String val = cells[cn];
@@ -233,9 +234,9 @@ public class TabularFormatsTest extends TikaTest {
String error = "Wrong text in row " + (rn + 1) + " and column " + (cn + 1) + " - " +
table[cn][rn] + " vs " + val;
if (table[cn][rn] instanceof String) {
- assertEquals(error, table[cn][rn], val);
+ assertEquals(table[cn][rn], val, error);
} else {
- assertTrue(error, ((Pattern) table[cn][rn]).matcher(val).matches());
+ assertTrue(((Pattern) table[cn][rn]).matcher(val).matches(), error);
}
}
}
@@ -305,7 +306,7 @@ public class TabularFormatsTest extends TikaTest {
if (val instanceof String) {
assertContains((String) val, xml);
} else if (val instanceof Pattern) {
- assertTrue("Not matched: " + val, ((Pattern) val).matcher(xml).find());
+ assertTrue(((Pattern) val).matcher(xml).find(), "Not matched: " + val);
}
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestParsers.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestParsers.java
index 1ffdf78..c317829 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestParsers.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestParsers.java
@@ -16,16 +16,16 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.MultiThreadedTikaTest;
@@ -44,7 +44,7 @@ public class TestParsers extends MultiThreadedTikaTest {
private Tika tika;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tc = TikaConfig.getDefaultConfig();
tika = new Tika(tc);
@@ -71,7 +71,7 @@ public class TestParsers extends MultiThreadedTikaTest {
.get(getResourceAsStream("/test-documents/testEXCEL.xls"))) {
File file = tis.getFile();
String s1 = tika.parseToString(file);
- assertTrue("Text does not contain '" + expected + "'", s1.contains(expected));
+ assertTrue(s1.contains(expected), "Text does not contain '" + expected + "'");
Parser parser = tika.getParser();
try (InputStream stream = new FileInputStream(file)) {
parser.parse(stream, new DefaultHandler(), metadata, new ParseContext());
@@ -88,11 +88,12 @@ public class TestParsers extends MultiThreadedTikaTest {
.get(getResourceAsStream("/test-documents/testOptionalHyphen." + extension))) {
String content = tika.parseToString(tis.getFile());
- assertTrue("optional hyphen was not handled for '" + extension + "' file type: " +
- content, content.contains("optionalhyphen") ||
- content.contains("optional\u00adhyphen") || // soft hyphen
- content.contains("optional\u200bhyphen") || // zero width space
- content.contains("optional\u2027")); // hyphenation point
+ assertTrue(content.contains("optionalhyphen") ||
+ content.contains("optional\u00adhyphen") || // soft hyphen
+ content.contains("optional\u200bhyphen") || // zero width space
+ content.contains("optional\u2027"),
+ "optional hyphen was not handled for '" + extension + "' file type: " +
+ content); // hyphenation point
}
}
@@ -104,10 +105,10 @@ public class TestParsers extends MultiThreadedTikaTest {
.get(getResourceAsStream("/test-documents/" + fileName + "." + extension))) {
content = tika.parseToString(tis.getFile());
}
- assertTrue(extension + ": content=" + content + " did not extract text",
- content.contains("Here is some text"));
- assertTrue(extension + ": content=" + content + " did not extract comment",
- content.contains("Here is a comment"));
+ assertTrue(content.contains("Here is some text"),
+ extension + ": content=" + content + " did not extract text");
+ assertTrue(content.contains("Here is a comment"),
+ extension + ": content=" + content + " did not extract comment");
}
@Test
@@ -121,7 +122,7 @@ public class TestParsers extends MultiThreadedTikaTest {
//TODO: add a @smoketest tag or something similar to run this occasionally automatically
@Test
- @Ignore("ignore for regular builds; run occasionally")
+ @Disabled("disabled for regular builds; run occasionally")
public void testAllMultiThreaded() throws Exception {
//this runs against all files in /test-documents
ParseContext[] contexts = new ParseContext[10];
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
index f60950d..16f084d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
@@ -16,16 +16,17 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import javax.xml.XMLConstants;
import javax.xml.parsers.SAXParserFactory;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.xml.sax.SAXParseException;
import org.apache.tika.exception.TikaException;
@@ -77,13 +78,14 @@ public class TestXMLEntityExpansion extends XMLTestBase {
}
ex = true;
}
- assertTrue("should have had an exception", ex);
+ assertTrue(ex, "should have had an exception");
}
//Set a reasonable amount of time as the timeout
//Make sure that the test apparatus actually works.
- @Ignore
- @Test(timeout = 20000)
+ @Disabled
+ @Test
+ @Timeout(20000)
public void testVulnerableParser() throws Exception {
byte[] bytes = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><document>blah</document>"
.getBytes(StandardCharsets.UTF_8);
@@ -104,7 +106,8 @@ public class TestXMLEntityExpansion extends XMLTestBase {
}
- @Test(timeout = 30000)//
+ @Test
+ @Timeout(30000)
public void testProtectedXML() throws Exception {
byte[] bytes = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><document>blah</document>"
.getBytes(StandardCharsets.UTF_8);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXXEInXML.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXXEInXML.java
index fd2b009..207b6f7 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXXEInXML.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/TestXXEInXML.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -30,8 +30,8 @@ import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.io.IOUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.config.TikaConfig;
@@ -56,7 +56,7 @@ public class TestXXEInXML extends XMLTestBase {
.getBytes(StandardCharsets.UTF_8);
@Test
- @Ignore("ignore vulnerable tests")
+ @Disabled("ignore vulnerable tests")
public void testConfirmVulnerable() throws Exception {
try {
parse("testXXE.xml", getResourceAsStream("/test-documents/testXXE.xml"),
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
index e5e01ae..42c27d6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
@@ -17,13 +17,12 @@
package org.apache.tika.parser.apple;
-
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/PListParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
index ecbe0b5..c6c5448 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.tika.parser.apple;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
public class PListParserTest extends TikaTest {
+
@Test
public void testWebArchive() throws Exception {
List<Metadata> metadataList = getRecursiveMetadata("testWEBARCHIVE.webarchive");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
index bdf1b66..1118251 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
@@ -16,18 +16,19 @@
*/
package org.apache.tika.parser.crypto;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
public class TSDParserTest extends TikaTest {
+
@Test
public void testBrokenPdf() throws Exception {
//make sure that embedded file appears in list
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
index 95c11f2..a750d2d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.fork;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.io.InputStream;
@@ -28,8 +28,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -201,7 +201,7 @@ public class ForkParserIntegrationTest extends MultiThreadedTikaTest {
}
@Test
- @Ignore("use for development/one off testing. This is a beast and takes enormous " +
+ @Disabled("use for development/one off testing. This is a beast and takes enormous " +
"resources and time")
public void smokeTest() throws Exception {
RecursiveParserWrapper wrapper = new RecursiveParserWrapper(tika.getParser());
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
index 8f863e8..77af4ab 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.parser.html;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -33,6 +33,7 @@ import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.Parser;
public class HtmlParserTest extends TikaTest {
+
@Test
public void testDataURI() throws Exception {
List<Metadata> metadataList = getRecursiveMetadata("testHTML_embedded_img.html");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
index c46b37d..1806802 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.mail;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -40,7 +40,7 @@ public class MboxParserTest extends TikaTest {
private TypeDetector typeDetector;
private MboxParser mboxParser;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
typeDetector = new TypeDetector();
autoDetectParser = new AutoDetectParser(typeDetector);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
index 9a47db9..e988cd4 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.parser.mail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.TikaTest;
@@ -46,11 +46,11 @@ public class RFC822ParserTest extends TikaTest {
private static InputStream getStream(String name) {
InputStream stream =
Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
- assertNotNull("Test file not found " + name, stream);
+ assertNotNull(stream, "Test file not found " + name);
return stream;
}
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
try (InputStream is = getStream(
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
index 44fce6c..0184886 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
index 7fac392..736ae59 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
@@ -18,7 +18,7 @@ package org.apache.tika.parser.microsoft;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
index 64ce4ff..6fb166e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.extractor.ContainerExtractor;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
index 5658114..fc47c7a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
public class PowerPointParserTest extends TikaTest {
+
@Test
public void testEmbeddedPDF() throws Exception {
List<Metadata> metadataList = getRecursiveMetadata("testPPT_EmbeddedPDF.ppt");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
index 9b700e6..2765a2a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
@@ -17,12 +17,12 @@
package org.apache.tika.parser.microsoft;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -30,6 +30,7 @@ import org.apache.tika.metadata.Office;
import org.apache.tika.metadata.TikaCoreProperties;
public class XML2003ParserTest extends TikaTest {
+
@Test
public void testBasicWord() throws Exception {
List<Metadata> list = getRecursiveMetadata("testWORD2003.xml");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
index c409cac..b1c63cd 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
@@ -18,8 +18,8 @@ package org.apache.tika.parser.microsoft.ooxml;
import java.util.List;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -60,8 +60,8 @@ public class OOXMLParserTest extends TikaTest {
assertContains("Hello World", pdfMetadata2.get(TikaCoreProperties.TIKA_CONTENT));
}
- @Ignore("TODO figure out why this doesn't work")
- @Test(expected = org.apache.tika.exception.TikaException.class)
+ @Disabled("TODO figure out why this doesn't work")
+ @Test//(expected = org.apache.tika.exception.TikaException.class)
public void testCorruptedZip() throws Exception {
//TIKA_2446
getRecursiveMetadata("testZIP_corrupted_oom.zip");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
index d498ffb..0d3bfba 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.microsoft.ooxml;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
index ed312b5..9beb9d1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.parser.microsoft.rtf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.HashMap;
@@ -27,8 +27,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.FilenameUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.io.TikaInputStream;
@@ -41,6 +40,7 @@ import org.apache.tika.sax.BasicContentHandlerFactory;
import org.apache.tika.sax.RecursiveParserWrapperHandler;
public class RTFParserTest extends TikaTest {
+
// TIKA-1010
@Test
public void testEmbeddedMonster() throws Exception {
@@ -80,7 +80,7 @@ public class RTFParserTest extends TikaTest {
assertNotNull(metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY));
//necessary to getName() because MSOffice extractor includes
//directory: _1457338524/HW.txt
- Assert.assertEquals("filename equals ", p.fileName,
+ assertEquals(p.fileName,
FilenameUtils.getName(metadata.get(TikaCoreProperties.EMBEDDED_RESOURCE_PATH)));
assertEquals(p.mimeType, metadata.get(Metadata.CONTENT_TYPE));
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mock/MockParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
index 0f4e0c5..67376bb 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.parser.mock;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -27,7 +27,7 @@ import java.io.InputStream;
import java.io.PrintStream;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
@@ -108,7 +108,7 @@ public class MockParserTest extends TikaTest {
long elapsed = System.currentTimeMillis() - start;
//should sleep for at least 3000
boolean enoughTimeHasElapsed = elapsed > 2000;
- assertTrue("not enough time has not elapsed: " + elapsed, enoughTimeHasElapsed);
+ assertTrue(enoughTimeHasElapsed, "not enough time has not elapsed: " + elapsed);
assertMockParser(m);
}
@@ -122,7 +122,7 @@ public class MockParserTest extends TikaTest {
long elapsed = System.currentTimeMillis() - start;
//should sleep for at least 3000
boolean enoughTimeHasElapsed = elapsed > 2000;
- assertTrue("not enough time has elapsed: " + elapsed, enoughTimeHasElapsed);
+ assertTrue(enoughTimeHasElapsed, "not enough time has elapsed: " + elapsed);
assertMockParser(m);
}
@@ -168,7 +168,7 @@ public class MockParserTest extends TikaTest {
}
long elapsed = System.currentTimeMillis() - start;
boolean shortEnough = elapsed < 2000;//the xml file specifies 3000
- assertTrue("elapsed (" + elapsed + " millis) was not short enough", shortEnough);
+ assertTrue(shortEnough, "elapsed (" + elapsed + " millis) was not short enough");
}
@Test
@@ -191,7 +191,7 @@ public class MockParserTest extends TikaTest {
}
long elapsed = System.currentTimeMillis() - start;
boolean longEnough = elapsed >= 3000;//the xml file specifies 3000, this sleeps 1000
- assertTrue("elapsed (" + elapsed + " millis) was not long enough", longEnough);
+ assertTrue(longEnough, "elapsed (" + elapsed + " millis) was not long enough");
}
private void assertThrowable(String path, Metadata m, Class<? extends Throwable> expected,
@@ -223,7 +223,7 @@ public class MockParserTest extends TikaTest {
break;
}
}
- assertTrue("mock parser should have been called", parsedByMock);
+ assertTrue(parsedByMock, "mock parser should have been called");
}
private class ParserRunnable implements Runnable {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
index 187cc3e..2661640 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
@@ -16,15 +16,13 @@
*/
package org.apache.tika.parser.ocr;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaConfigException;
@@ -64,7 +62,7 @@ public class TesseractOCRParserTest extends TikaTest {
parseContext.set(TesseractOCRConfig.class, skipOcrConfig);
// No types offered
- Assert.assertEquals(0, parser.getSupportedTypes(parseContext).size());
+ assertEquals(0, parser.getSupportedTypes(parseContext).size());
// And DefaultParser won't use us
assertEquals(ImageParser.class, defaultParser.getParsers(parseContext).get(png).getClass());
@@ -93,7 +91,7 @@ public class TesseractOCRParserTest extends TikaTest {
@Test
public void testOCROutputsHOCR() throws Exception {
- assumeTrue("can run OCR", canRun());
+ assumeTrue(canRun(), "can run OCR");
String resource = "testOCR.pdf";
@@ -109,7 +107,7 @@ public class TesseractOCRParserTest extends TikaTest {
@Test
public void testParserContentTypeOverride() throws Exception {
- Assume.assumeTrue("can run OCR", canRun());
+ assumeTrue(canRun(), "can run OCR");
//this tests that the content-type is not overwritten by the ocr parser
// override content type
List<Metadata> metadata = getRecursiveMetadata("testOCR.pdf", AUTO_DETECT_PARSER,
@@ -120,7 +118,7 @@ public class TesseractOCRParserTest extends TikaTest {
private void testBasicOCR(String resource, String[] nonOCRContains, int numMetadatas)
throws Exception {
- Assume.assumeTrue("can run OCR", canRun());
+ assumeTrue(canRun(), "can run OCR");
String contents = runOCR(resource, nonOCRContains, numMetadatas,
BasicContentHandlerFactory.HANDLER_TYPE.TEXT, TesseractOCRConfig.OUTPUT_TYPE.TXT);
@@ -168,7 +166,7 @@ public class TesseractOCRParserTest extends TikaTest {
@Test
public void testSingleImage() throws Exception {
- Assume.assumeTrue("can run OCR", canRun());
+ assumeTrue(canRun(), "can run OCR");
String xml = getXML("testOCR.jpg").xml;
assertContains("OCR Testing", xml);
//test metadata extraction
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
index cac947b..0175697 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.parser.odf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.apache.tika.TikaTest;
@@ -37,7 +37,7 @@ import org.apache.tika.parser.Parser;
public class ODFParserTest extends TikaTest {
private static Parser MACRO_PARSER;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws IOException, TikaException, SAXException {
MACRO_PARSER = new AutoDetectParser(
new TikaConfig(ODFParserTest.class.getResourceAsStream("tika-config-macros.xml")));
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
index b5e67e4..8c8d4d0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser.pdf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
import java.util.List;
@@ -29,9 +29,9 @@ import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -70,14 +70,14 @@ public class PDFParserTest extends TikaTest {
return hasTesseract;
}
- @BeforeClass
+ @BeforeAll
public static void setup() {
//remember default logging level, but turn off for PDFParserTest
PDFBOX_LOG_LEVEL = Logger.getLogger("org.apache.pdfbox").getLevel();
Logger.getLogger("org.apache.pdfbox").setLevel(Level.OFF);
}
- @AfterClass
+ @AfterAll
public static void tearDown() {
//return to regular logging level
Logger.getLogger("org.apache.pdfbox").setLevel(PDFBOX_LOG_LEVEL);
@@ -145,18 +145,18 @@ public class PDFParserTest extends TikaTest {
public void testOSSpecificEmbeddedFileExtraction() throws Exception {
List<Metadata> metadatas =
getRecursiveMetadata("testPDF_multiFormatEmbFiles.pdf", NO_OCR());
- assertEquals("metadata size", 5, metadatas.size());
+ assertEquals(5, metadatas.size(), "metadata size");
- assertEquals("file name", "Test.txt",
+ assertEquals("Test.txt",
metadatas.get(1).get(TikaCoreProperties.RESOURCE_NAME_KEY));
assertContains("os specific", metadatas.get(1).get(TikaCoreProperties.TIKA_CONTENT));
- assertEquals("file name", "TestMac.txt",
+ assertEquals("TestMac.txt",
metadatas.get(2).get(TikaCoreProperties.RESOURCE_NAME_KEY));
assertContains("mac embedded", metadatas.get(2).get(TikaCoreProperties.TIKA_CONTENT));
- assertEquals("file name", "TestDos.txt",
+ assertEquals("TestDos.txt",
metadatas.get(3).get(TikaCoreProperties.RESOURCE_NAME_KEY));
assertContains("dos embedded", metadatas.get(3).get(TikaCoreProperties.TIKA_CONTENT));
- assertEquals("file name", "TestUnix.txt",
+ assertEquals("TestUnix.txt",
metadatas.get(4).get(TikaCoreProperties.RESOURCE_NAME_KEY));
assertContains("unix embedded", metadatas.get(4).get(TikaCoreProperties.TIKA_CONTENT));
@@ -237,7 +237,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testEmbeddedDocsWithOCROnly() throws Exception {
- assumeTrue("can run OCR", canRunOCR());
+ assumeTrue(canRunOCR(), "can run OCR");
//test default is "auto"
assertEquals(PDFParserConfig.OCR_STRATEGY.AUTO, new PDFParserConfig().getOcrStrategy());
testStrategy(null);
@@ -342,8 +342,8 @@ public class PDFParserTest extends TikaTest {
fail("Exception: " + metadatas.get(1).get(key));
}
}
- assertEquals("Invalid height.", "91", metadatas.get(1).get("height"));
- assertEquals("Invalid width.", "352", metadatas.get(1).get("width"));
+ assertEquals("91", metadatas.get(1).get("height"));
+ assertEquals("352", metadatas.get(1).get("width"));
assertNull(metadatas.get(0).get(TikaCoreProperties.RESOURCE_NAME_KEY));
assertEquals("image0.jb2", metadatas.get(1).get(TikaCoreProperties.RESOURCE_NAME_KEY));
@@ -353,7 +353,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testJBIG2OCROnly() throws Exception {
- assumeTrue("can run OCR", canRunOCR());
+ assumeTrue(canRunOCR(), "can run OCR");
PDFParserConfig config = new PDFParserConfig();
config.setOcrStrategy(PDFParserConfig.OCR_STRATEGY.OCR_ONLY);
ParseContext context = new ParseContext();
@@ -365,7 +365,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testJPEG2000() throws Exception {
- assumeTrue("can run OCR", canRunOCR());
+ assumeTrue(canRunOCR(), "can run OCR");
PDFParserConfig config = new PDFParserConfig();
config.setOcrStrategy(PDFParserConfig.OCR_STRATEGY.OCR_ONLY);
ParseContext context = new ParseContext();
@@ -377,7 +377,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testOCRAutoMode() throws Exception {
- assumeTrue("can run OCR", canRunOCR());
+ assumeTrue(canRunOCR(), "can run OCR");
//default
assertContains("Happy New Year", getXML("testOCR.pdf").xml);
@@ -396,7 +396,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testOCRNoText() throws Exception {
- assumeTrue("can run OCR", canRunOCR());
+ assumeTrue(canRunOCR(), "can run OCR");
PDFParserConfig config = new PDFParserConfig();
config.setOcrRenderingStrategy(PDFParserConfig.OCR_RENDERING_STRATEGY.ALL);
config.setOcrStrategy(PDFParserConfig.OCR_STRATEGY.OCR_ONLY);
@@ -419,7 +419,7 @@ public class PDFParserTest extends TikaTest {
//TIKA-2970 -- make sure that configurations set on the TesseractOCRParser
//make it through to when the TesseractOCRParser is called via
//the PDFParser
- assumeTrue("can run OCR", canRunOCR());
+ assumeTrue(canRunOCR(), "can run OCR");
//via the config, tesseract should skip this file because it is too large
try (InputStream is = getResourceAsStream(
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
index 0e98350..79393d4 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
index e814282..270afc5 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
index ce5ebdb..cba5208 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.BufferedInputStream;
import java.io.File;
@@ -30,8 +30,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
@@ -120,7 +120,7 @@ public class CompositeZipContainerDetectorTest extends TikaTest {
}
*/
- @Ignore("for offline testing")
+ @Disabled("for offline testing")
@Test
public void timeDetection() throws Exception {
TikaConfig config = TikaConfig.getDefaultConfig();
@@ -163,7 +163,7 @@ public class CompositeZipContainerDetectorTest extends TikaTest {
}
@Test
- @Ignore("to be used for offline timing tests")
+ @Disabled("to be used for offline timing tests")
public void timeParsing() throws Exception {
TikaConfig config = TikaConfig.getDefaultConfig();
Detector detector = config.getDetector();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
index aedc395..574f8ae 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.exception.TikaMemoryLimitException;
@@ -31,6 +32,7 @@ import org.apache.tika.sax.BodyContentHandler;
* Test case for parsing compress (.Z) files.
*/
public class CompressParserTest extends AbstractPkgTest {
+
@Test
public void testCompressParsing() throws Exception {
ContentHandler handler = new BodyContentHandler();
@@ -63,9 +65,11 @@ public class CompressParserTest extends AbstractPkgTest {
}
- @Test(expected = TikaMemoryLimitException.class)
- public void testLZMAOOM() throws Exception {
- getXML("testLZMA_oom");
+ @Test
+ public void testLZMAOOM() {
+ assertThrows(TikaMemoryLimitException.class, () -> {
+ getXML("testLZMA_oom");
+ });
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
index 3473cb2..d552f98 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
@@ -17,12 +17,11 @@
package org.apache.tika.parser.pkg;
-
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
index 3208036..fa2421b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
index 0521397..b16f3f5 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
@@ -18,7 +18,7 @@ package org.apache.tika.parser.pkg;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
index cbe7b7a..b988284 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
index ab26983..ce36bf3 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.security.NoSuchAlgorithmException;
import javax.crypto.Cipher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.exception.EncryptedDocumentException;
@@ -49,8 +49,8 @@ public class Seven7ParserTest extends AbstractPkgTest {
Metadata metadata = new Metadata();
// Ensure 7zip is a parsable format
- assertTrue("No 7zip parser found",
- AUTO_DETECT_PARSER.getSupportedTypes(recursingContext).contains(TYPE_7ZIP));
+ assertTrue(AUTO_DETECT_PARSER.getSupportedTypes(recursingContext).contains(TYPE_7ZIP),
+ "No 7zip parser found");
// Parse
String content = getText("test-documents.7z", metadata);
@@ -92,7 +92,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
ex = true;
}
- assertTrue("test no password", ex);
+ assertTrue(ex, "test no password");
// No password, will fail with EncryptedDocumentException
ex = false;
@@ -106,7 +106,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
ex = false;
}
- assertTrue("test no password for full encrypted 7z", ex);
+ assertTrue(ex, "test no password for full encrypted 7z");
ex = false;
@@ -125,7 +125,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
// "(do you have the JCE Unlimited Strength Jurisdiction Policy Files installed?")
ex = true;
}
- assertTrue("TikaException for bad password", ex);
+ assertTrue(ex, "TikaException for bad password");
// Will be empty
assertEquals("", handler.toString());
@@ -161,7 +161,7 @@ public class Seven7ParserTest extends AbstractPkgTest {
} catch (TikaException e) {
ioe = true;
}
- assertTrue("IOException because JCE was not installed", ioe);
+ assertTrue(ioe, "IOException because JCE was not installed");
}
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
index 95f8cd2..bf2c805 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
index 24f1d0f..9f9f713 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.extractor.EmbeddedDocumentExtractor;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
index 8bf8383..ba409c5 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.pkg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.metadata.Metadata;
@@ -30,6 +30,7 @@ import org.apache.tika.sax.BodyContentHandler;
* Test case for parsing zlib compressed
*/
public class ZlibParserTest extends AbstractPkgTest {
+
@Test
public void testZlibParsing() throws Exception {
ContentHandler handler = new BodyContentHandler();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
index ae2bf44..4ca6666 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.parser.xml;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.extractor.ContainerExtractor;
@@ -29,7 +29,6 @@ import org.apache.tika.io.TikaInputStream;
public class FictionBookParserTest {
- //not sure why this isn't passing
@Test
public void testEmbedded() throws Exception {
try (InputStream input = FictionBookParserTest.class
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
index 87e9474..b1a639a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
@@ -19,7 +19,7 @@ package org.apache.tika.sax;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -34,6 +34,7 @@ import org.apache.tika.parser.ParseContext;
* You can get an array of phone numbers by calling metadata.getValues("phonenumber").
*/
public class PhoneExtractingContentHandlerTest extends TikaTest {
+
@Test
public void testExtractPhoneNumbers() throws Exception {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
index 7903025..da71ebd 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
@@ -18,11 +18,11 @@
package org.apache.tika.sax;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
index 3713cb3..a2e00d4 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
@@ -17,16 +17,17 @@
package org.apache.tika.utils;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.parser.DefaultParser;
import org.apache.tika.parser.Parser;
public class ServiceLoaderUtilsTest extends TikaTest {
+
@Test
public void testOrdering() throws Exception {
//make sure that non Tika parsers come last
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml b/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
index e0d1f4c..958b626 100644
--- a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
@@ -67,11 +67,6 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-core</artifactId>
<version>${project.version}</version>
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
index 6f20a50..d34112e 100644
--- a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
@@ -85,11 +85,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml b/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
index 93bc40e..d613e57 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
@@ -86,11 +86,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
index 4341f3d..d182c65 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
@@ -44,11 +44,6 @@
<artifactId>tika-httpclient-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
index 79c9b6c..03e3e7f 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
@@ -78,11 +78,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
index 11eb59d..4b3bac3 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
@@ -43,11 +43,6 @@
<artifactId>commons-csv</artifactId>
<version>${commons.csv.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
index 029465f..a8be3dc 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
@@ -44,11 +44,6 @@
<version>${h2.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
index a657dc3..8c40259 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
@@ -81,11 +81,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
index d43d375..e703047 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
@@ -85,11 +85,6 @@
<artifactId>tika-httpclient-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-serialization/pom.xml b/tika-serialization/pom.xml
index 390c13b..885cddb 100644
--- a/tika-serialization/pom.xml
+++ b/tika-serialization/pom.xml
@@ -62,11 +62,6 @@
<version>${jackson.version}</version>
</dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/tika-server/tika-server-client/pom.xml b/tika-server/tika-server-client/pom.xml
index 14a6e5c..93cf316 100644
--- a/tika-server/tika-server-client/pom.xml
+++ b/tika-server/tika-server-client/pom.xml
@@ -52,11 +52,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tika-server/tika-server-core/pom.xml b/tika-server/tika-server-core/pom.xml
index b865fe1..69362e7 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -172,11 +172,7 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index f7f5438..82a699d 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -61,6 +61,12 @@
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.simple.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- for java 10
See TIKA-2778 for why we need to do this now.
@@ -112,12 +118,6 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml
index 8d24b94..0bb8dcf 100644
--- a/tika-xmp/pom.xml
+++ b/tika-xmp/pom.xml
@@ -99,10 +99,6 @@
<artifactId>xmpcore</artifactId>
<version>${xmpcore.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<description>Converts Tika metadata to XMP</description>