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:36 UTC
[tika] 02/03: TIKA-3500 migrate tika-core 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 7ef7217de6c06448d7a612cc2803011a3c639f1f
Author: tallison <ta...@apache.org>
AuthorDate: Tue Jul 27 16:15:35 2021 -0400
TIKA-3500 migrate tika-core to junit5
---
tika-core/pom.xml | 11 +++-
.../org/apache/tika/MultiThreadedTikaTest.java | 20 +++----
.../org/apache/tika/TestRereadableInputStream.java | 29 ++++-----
.../java/org/apache/tika/TikaDetectionTest.java | 5 +-
.../src/test/java/org/apache/tika/TikaIT.java | 7 +--
.../src/test/java/org/apache/tika/TikaTest.java | 20 +++----
.../apache/tika/config/AbstractTikaConfigTest.java | 10 ++--
.../org/apache/tika/config/MockConfigTest.java | 4 +-
.../java/org/apache/tika/config/ParamTest.java | 5 +-
.../tika/config/TikaConfigSerializerTest.java | 6 +-
.../org/apache/tika/config/TikaConfigTest.java | 69 +++++++++++++---------
.../apache/tika/config/TikaPipesConfigTest.java | 42 ++++++++-----
.../tika/detect/FileCommandDetectorTest.java | 10 ++--
.../org/apache/tika/detect/MagicDetectorTest.java | 6 +-
.../tika/detect/MimeDetectionWithNNTest.java | 15 ++---
.../org/apache/tika/detect/NameDetectorTest.java | 10 ++--
.../org/apache/tika/detect/TextDetectorTest.java | 6 +-
.../org/apache/tika/detect/TypeDetectorTest.java | 6 +-
.../tika/detect/ZeroSizeFileDetectorTest.java | 10 ++--
.../java/org/apache/tika/fork/ForkParserTest.java | 12 ++--
.../apache/tika/fork/ForkParserTikaBinTest.java | 12 ++--
.../java/org/apache/tika/fork/ForkTestParser.java | 5 +-
.../java/org/apache/tika/io/EndianUtilsTest.java | 6 +-
.../java/org/apache/tika/io/FilenameUtilsTest.java | 8 +--
.../apache/tika/io/LookaheadInputStreamTest.java | 4 +-
.../java/org/apache/tika/io/TailStreamTest.java | 42 ++++++-------
.../org/apache/tika/io/TemporaryResourcesTest.java | 11 ++--
.../org/apache/tika/io/TikaInputStreamTest.java | 48 ++++++++-------
.../tika/language/detect/LanguageNamesTest.java | 4 +-
.../org/apache/tika/metadata/TestMetadata.java | 24 ++++----
.../tika/metadata/filter/TestMetadataFilter.java | 8 +--
.../org/apache/tika/mime/CustomReaderTest.java | 10 ++--
.../java/org/apache/tika/mime/MediaTypeTest.java | 8 +--
.../org/apache/tika/mime/MimeDetectionTest.java | 20 ++++---
.../org/apache/tika/mime/MimeTypesReaderTest.java | 67 ++++++++++++---------
.../java/org/apache/tika/mime/PatternsTest.java | 12 ++--
.../tika/mime/ProbabilisticMimeDetectionTest.java | 17 +++---
.../ProbabilisticMimeDetectionTestWithTika.java | 21 +++----
.../apache/tika/parser/CompositeParserTest.java | 6 +-
.../tika/parser/InitializableParserTest.java | 4 +-
.../tika/parser/ParameterizedParserTest.java | 41 +++++--------
.../apache/tika/parser/ParserDecoratorTest.java | 18 +++---
.../apache/tika/parser/mock/MockParserTest.java | 2 +-
.../tika/parser/multiple/MultipleParserTest.java | 8 +--
.../tika/pipes/async/AsyncProcessorTest.java | 12 ++--
.../pipes/fetcher/fs/FileSystemFetcherTest.java | 17 +++---
.../pipesiterator/FileSystemPipesIteratorTest.java | 12 ++--
.../filelist/FileListPipesIteratorTest.java | 6 +-
.../tika/sax/BasicContentHandlerFactoryTest.java | 16 ++---
.../apache/tika/sax/BodyContentHandlerTest.java | 4 +-
.../apache/tika/sax/LinkContentHandlerTest.java | 4 +-
.../apache/tika/sax/OfflineContentHandlerTest.java | 8 +--
.../tika/sax/RichTextContentHandlerTest.java | 4 +-
.../apache/tika/sax/SafeContentHandlerTest.java | 8 +--
.../apache/tika/sax/SecureContentHandlerTest.java | 8 +--
.../java/org/apache/tika/sax/SerializerTest.java | 4 +-
.../apache/tika/sax/XHTMLContentHandlerTest.java | 10 ++--
.../org/apache/tika/sax/xpath/XPathParserTest.java | 12 ++--
.../org/apache/tika/utils/AnnotationUtilsTest.java | 41 +++++++------
.../org/apache/tika/utils/CharsetUtilsTest.java | 9 +--
.../org/apache/tika/utils/ConcurrentUtilsTest.java | 4 +-
.../java/org/apache/tika/utils/RegexUtilsTest.java | 23 ++++----
.../apache/tika/utils/ServiceLoaderUtilsTest.java | 7 +--
63 files changed, 482 insertions(+), 436 deletions(-)
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 10d68cb..571d73a 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -100,8 +100,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <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>
</dependencies>
diff --git a/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java b/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
index 54e32ce..bf27240 100644
--- a/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
+++ b/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
@@ -17,7 +17,7 @@
package org.apache.tika;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.FileFilter;
import java.io.IOException;
@@ -133,16 +133,16 @@ public class MultiThreadedTikaTest extends TikaTest {
//this currently only checks the basics
//might want to add more checks
- assertEquals("number of embedded files", extractA.metadataList.size(),
- extractB.metadataList.size());
+ assertEquals(extractA.metadataList.size(), extractB.metadataList.size(),
+ "number of embedded files");
for (int i = 0; i < extractA.metadataList.size(); i++) {
- assertEquals("number of metadata elements in attachment: " + i,
- extractA.metadataList.get(i).size(), extractB.metadataList.get(i).size());
+ assertEquals(extractA.metadataList.get(i).size(), extractB.metadataList.get(i).size(),
+ "number of metadata elements in attachment: " + i);
- assertEquals("content in attachment: " + i,
- extractA.metadataList.get(i).get(TikaCoreProperties.TIKA_CONTENT),
- extractB.metadataList.get(i).get(TikaCoreProperties.TIKA_CONTENT));
+ assertEquals(extractA.metadataList.get(i).get(TikaCoreProperties.TIKA_CONTENT),
+ extractB.metadataList.get(i).get(TikaCoreProperties.TIKA_CONTENT),
+ "content in attachment: " + i);
}
}
@@ -427,8 +427,8 @@ public class MultiThreadedTikaTest extends TikaTest {
Metadata metadata = new Metadata();
try (TikaInputStream tis = TikaInputStream.get(testFile, metadata)) {
MediaType mediaType = detector.detect(tis, metadata);
- assertEquals("failed on: " + testFile.getFileName(), truth.get(testFile),
- mediaType);
+ assertEquals(truth.get(testFile), mediaType,
+ "failed on: " + testFile.getFileName());
}
}
return 1;
diff --git a/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java b/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java
index aaae0b6..5d665de 100644
--- a/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java
+++ b/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java
@@ -16,7 +16,8 @@
*/
package org.apache.tika;
-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.BufferedInputStream;
import java.io.File;
@@ -25,7 +26,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.utils.RereadableInputStream;
@@ -85,13 +86,13 @@ public class TestRereadableInputStream {
for (int pass = 0; pass < NUM_PASSES; pass++) {
for (int byteNum = 0; byteNum < testSize; byteNum++) {
int byteRead = ris.read();
- assertEquals("Pass = " + pass + ", byte num should be " + byteNum + " but is " +
- byteRead + ".", byteNum, byteRead);
+ assertEquals(byteNum, byteRead,
+ "Pass = " + pass + ", byte num should be " + byteNum + " but is " +
+ byteRead + ".");
}
int eof = ris.read();
- assertEquals(
- "Pass = " + pass + ", byte num should be " + -1 + " but is " + eof + ".",
- -1, eof);
+ assertEquals(-1, eof,
+ "Pass = " + pass + ", byte num should be " + -1 + " but is " + eof + ".");
ris.rewind();
}
}
@@ -109,8 +110,8 @@ public class TestRereadableInputStream {
for (int pass = 0; pass < NUM_PASSES; pass++) {
for (int byteNum = 0; byteNum < iterations; byteNum++) {
int byteRead = ris.read();
- assertEquals("Pass = " + pass + ", byte num should be " + byteNum + " but is " +
- byteRead + ".", byteNum, byteRead);
+ assertEquals(byteNum, byteRead,
+ "Pass = " + pass + ", byte num should be " + byteNum + " but is " + byteRead + ".");
}
ris.rewind();
iterations++;
@@ -126,8 +127,7 @@ public class TestRereadableInputStream {
ris.rewind(); // rewind before we've done anything
for (int byteNum = 0; byteNum < 1; byteNum++) {
int byteRead = ris.read();
- assertEquals("Byte num should be " + byteNum + " but is " + byteRead + ".", byteNum,
- byteRead);
+ assertEquals(byteNum, byteRead, "Byte num should be " + byteNum + " but is " + byteRead + ".");
}
}
}
@@ -167,13 +167,14 @@ public class TestRereadableInputStream {
}
}
- @Test(expected = IOException.class)
+ @Test
public void doReadAfterCloseTest() throws IOException {
-
TestInputStream tis = createTestInputStream(DEFAULT_TEST_SIZE);
RereadableInputStream ris = new RereadableInputStream(tis, DEFAULT_TEST_SIZE);
ris.close();
- ris.read();
+ assertThrows(IOException.class, () -> {
+ ris.read();
+ });
}
diff --git a/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java b/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
index 0f34d10..1cd0f40 100644
--- a/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
+++ b/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.tika;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
public class TikaDetectionTest {
diff --git a/tika-core/src/test/java/org/apache/tika/TikaIT.java b/tika-core/src/test/java/org/apache/tika/TikaIT.java
index 6124bcb..1604818 100644
--- a/tika-core/src/test/java/org/apache/tika/TikaIT.java
+++ b/tika-core/src/test/java/org/apache/tika/TikaIT.java
@@ -16,11 +16,10 @@
*/
package org.apache.tika;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
public class TikaIT {
diff --git a/tika-core/src/test/java/org/apache/tika/TikaTest.java b/tika-core/src/test/java/org/apache/tika/TikaTest.java
index a9d724e..48fccd8 100644
--- a/tika-core/src/test/java/org/apache/tika/TikaTest.java
+++ b/tika-core/src/test/java/org/apache/tika/TikaTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika;
-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.ByteArrayOutputStream;
import java.io.EOFException;
@@ -71,24 +71,24 @@ public abstract class TikaTest {
count++;
i = haystack.indexOf(needle, i + 1);
}
- assertEquals("found " + count + " but should have found: " + targetCount, targetCount,
- count);
+ assertEquals(targetCount, count,
+ "found " + count + " but should have found: " + targetCount);
}
public static void assertContains(String needle, String haystack) {
- assertTrue(needle + " not found in:\n" + haystack, haystack.contains(needle));
+ assertTrue(haystack.contains(needle), needle + " not found in:\n" + haystack);
}
public static <T> void assertContains(T needle, Collection<? extends T> haystack) {
- assertTrue(needle + " not found in:\n" + haystack, haystack.contains(needle));
+ assertTrue(haystack.contains(needle), needle + " not found in:\n" + haystack);
}
public static void assertNotContained(String needle, String haystack) {
- assertFalse(needle + " unexpectedly found in:\n" + haystack, haystack.contains(needle));
+ assertFalse(haystack.contains(needle), needle + " unexpectedly found in:\n" + haystack);
}
public static <T> void assertNotContained(T needle, Collection<? extends T> haystack) {
- assertFalse(needle + " unexpectedly found in:\n" + haystack, haystack.contains(needle));
+ assertFalse(haystack.contains(needle), needle + " unexpectedly found in:\n" + haystack);
}
/**
diff --git a/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java b/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
index 41ac293..763cb43 100644
--- a/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
+++ b/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.config;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
import org.apache.tika.TikaTest;
import org.apache.tika.parser.ParseContext;
@@ -38,14 +38,14 @@ public abstract class AbstractTikaConfigTest extends TikaTest {
protected static Path getConfigFilePath(String config) throws Exception {
URL url = TikaConfig.class.getResource(config);
- assertNotNull("Test Tika Config not found: " + config, url);
+ assertNotNull(url, "Test Tika Config not found: " + config);
return Paths.get(url.toURI());
}
protected static String getConfigPath(String config) throws Exception {
URL url = TikaConfig.class.getResource(config);
- assertNotNull("Test Tika Config not found: " + config, url);
+ assertNotNull(url, "Test Tika Config not found: " + config);
return url.toExternalForm();
}
@@ -54,7 +54,7 @@ public abstract class AbstractTikaConfigTest extends TikaTest {
return new TikaConfig();
}
- @After
+ @AfterEach
public void resetConfig() {
System.clearProperty("tika.config");
}
diff --git a/tika-core/src/test/java/org/apache/tika/config/MockConfigTest.java b/tika-core/src/test/java/org/apache/tika/config/MockConfigTest.java
index ed484b6..9bbe8ed 100644
--- a/tika-core/src/test/java/org/apache/tika/config/MockConfigTest.java
+++ b/tika-core/src/test/java/org/apache/tika/config/MockConfigTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.config;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.exception.TikaException;
diff --git a/tika-core/src/test/java/org/apache/tika/config/ParamTest.java b/tika-core/src/test/java/org/apache/tika/config/ParamTest.java
index f6bc6ab..5f5321d 100644
--- a/tika-core/src/test/java/org/apache/tika/config/ParamTest.java
+++ b/tika-core/src/test/java/org/apache/tika/config/ParamTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.config;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,8 +27,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
public class ParamTest {
diff --git a/tika-core/src/test/java/org/apache/tika/config/TikaConfigSerializerTest.java b/tika-core/src/test/java/org/apache/tika/config/TikaConfigSerializerTest.java
index e643961..23fa72a 100644
--- a/tika-core/src/test/java/org/apache/tika/config/TikaConfigSerializerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/config/TikaConfigSerializerTest.java
@@ -21,8 +21,8 @@ package org.apache.tika.config;
import java.io.StringWriter;
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;
public class TikaConfigSerializerTest extends TikaConfigTest {
@@ -50,7 +50,7 @@ public class TikaConfigSerializerTest extends TikaConfigTest {
}
@Test
- @Ignore("TODO: executor-service info needs to be stored in TikaConfig for serialization")
+ @Disabled("TODO: executor-service info needs to be stored in TikaConfig for serialization")
public void testExecutors() throws Exception {
String xml = loadAndSerialize("TIKA-1762-executors.xml", TikaConfigSerializer.Mode.STATIC);
assertContains("<executor-service class=\"org.apache.tika.config.DummyExecutor\">" +
diff --git a/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java b/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java
index 9f8c84c..e9cb693 100644
--- a/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java
+++ b/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.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.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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.net.URI;
@@ -30,7 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadPoolExecutor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.ResourceLoggingClassLoader;
import org.apache.tika.exception.TikaConfigException;
@@ -159,8 +160,8 @@ public class TikaConfigTest extends AbstractTikaConfigTest {
Map<String, List<URL>> resources = customLoader.getLoadedResources();
int resourcesCount = resources.size();
- assertTrue("Not enough things used the classloader, found only " + resourcesCount,
- resourcesCount > 3);
+ assertTrue(resourcesCount > 3,
+ "Not enough things used the classloader, found only " + resourcesCount);
// Ensure everything that should do, did use it
// - Parsers
@@ -192,18 +193,18 @@ public class TikaConfigTest extends AbstractTikaConfigTest {
// Should have a wrapped DefaultParser, not the main DefaultParser,
// as it is excluded from handling certain classes
p = parsers.get(0);
- assertTrue(p.toString(), p instanceof ParserDecorator);
+ assertTrue(p instanceof ParserDecorator, p.toString());
assertEquals(DefaultParser.class, ((ParserDecorator) p).getWrappedParser().getClass());
// Should have two others which claim things, which they wouldn't
// otherwise handle
p = parsers.get(1);
- assertTrue(p.toString(), p instanceof ParserDecorator);
+ assertTrue(p instanceof ParserDecorator, p.toString());
assertEquals(EmptyParser.class, ((ParserDecorator) p).getWrappedParser().getClass());
assertEquals("hello/world", p.getSupportedTypes(null).iterator().next().toString());
p = parsers.get(2);
- assertTrue(p.toString(), p instanceof ParserDecorator);
+ assertTrue(p instanceof ParserDecorator, p.toString());
assertEquals(ErrorParser.class, ((ParserDecorator) p).getWrappedParser().getClass());
assertEquals("fail/world", p.getSupportedTypes(null).iterator().next().toString());
} catch (TikaException e) {
@@ -230,11 +231,11 @@ public class TikaConfigTest extends AbstractTikaConfigTest {
// Should have a CompositeParser with 2 child ones, and
// and a wrapped empty parser
p = parsers.get(0);
- assertTrue(p.toString(), p instanceof CompositeParser);
+ assertTrue(p instanceof CompositeParser, p.toString());
assertEquals(2, ((CompositeParser) p).getAllComponentParsers().size());
p = parsers.get(1);
- assertTrue(p.toString(), p instanceof ParserDecorator);
+ assertTrue(p instanceof ParserDecorator, p.toString());
assertEquals(EmptyParser.class, ((ParserDecorator) p).getWrappedParser().getClass());
assertEquals("hello/world", p.getSupportedTypes(null).iterator().next().toString());
} catch (TikaException e) {
@@ -252,7 +253,7 @@ public class TikaConfigTest extends AbstractTikaConfigTest {
ServiceLoader loader = parser.getLoader();
boolean dynamicValue = loader.isDynamic();
- assertTrue("Dynamic Service Loading Should be true", dynamicValue);
+ assertTrue(dynamicValue, "Dynamic Service Loading Should be true");
}
@Test
@@ -263,26 +264,32 @@ public class TikaConfigTest extends AbstractTikaConfigTest {
ThreadPoolExecutor executorService = (ThreadPoolExecutor) config.getExecutorService();
- assertTrue("Should use Dummy Executor", (executorService instanceof DummyExecutor));
- assertEquals("Should have configured Core Threads", 3, executorService.getCorePoolSize());
- assertEquals("Should have configured Max Threads", 10,
- executorService.getMaximumPoolSize());
+ assertTrue((executorService instanceof DummyExecutor), "Should use Dummy Executor");
+ assertEquals(3, executorService.getCorePoolSize(), "Should have configured Core Threads");
+ assertEquals(10, executorService.getMaximumPoolSize(),
+ "Should have configured Max Threads");
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testInitializerBadValue() throws Exception {
- TikaConfig config = getConfig("TIKA-2389-illegal.xml");
+ assertThrows(TikaConfigException.class, () -> {
+ TikaConfig config = getConfig("TIKA-2389-illegal.xml");
+ });
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testInitializerPerParserThrow() throws Exception {
- TikaConfig config = getConfig("TIKA-2389-throw-per-parser.xml");
+ assertThrows(TikaConfigException.class, () -> {
+ TikaConfig config = getConfig("TIKA-2389-throw-per-parser.xml");
+ });
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testInitializerServiceLoaderThrow() throws Exception {
- TikaConfig config = getConfig("TIKA-2389-throw-default.xml");
+ assertThrows(TikaConfigException.class, () -> {
+ TikaConfig config = getConfig("TIKA-2389-throw-default.xml");
+ });
}
@Test
@@ -305,11 +312,11 @@ public class TikaConfigTest extends AbstractTikaConfigTest {
Parser p;
p = parser.getAllComponentParsers().get(0);
- assertTrue(p.toString(), p instanceof ParserDecorator);
+ assertTrue(p instanceof ParserDecorator, p.toString());
assertEquals(DefaultParser.class, ((ParserDecorator) p).getWrappedParser().getClass());
p = parser.getAllComponentParsers().get(1);
- assertTrue(p.toString(), p instanceof ParserDecorator);
+ assertTrue(p instanceof ParserDecorator, p.toString());
assertEquals(FallbackParser.class, ((ParserDecorator) p).getWrappedParser().getClass());
FallbackParser fbp = (FallbackParser) ((ParserDecorator) p).getWrappedParser();
@@ -345,14 +352,18 @@ public class TikaConfigTest extends AbstractTikaConfigTest {
}
}
- @Test(expected = NumberFormatException.class)
+ @Test
public void testXMLReaderUtilsException() throws Exception {
- getConfig("TIKA-2732-xmlreaderutils-exc.xml");
+ assertThrows(NumberFormatException.class, () -> {
+ getConfig("TIKA-2732-xmlreaderutils-exc.xml");
+ });
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testBadExclude() throws Exception {
- getConfig("TIKA-3268-bad-parser-exclude.xml");
+ assertThrows(TikaConfigException.class, () -> {
+ getConfig("TIKA-3268-bad-parser-exclude.xml");
+ });
}
diff --git a/tika-core/src/test/java/org/apache/tika/config/TikaPipesConfigTest.java b/tika-core/src/test/java/org/apache/tika/config/TikaPipesConfigTest.java
index b27a82f..05ffb70 100644
--- a/tika-core/src/test/java/org/apache/tika/config/TikaPipesConfigTest.java
+++ b/tika-core/src/test/java/org/apache/tika/config/TikaPipesConfigTest.java
@@ -16,12 +16,13 @@
*/
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 java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.exception.TikaConfigException;
import org.apache.tika.pipes.emitter.Emitter;
@@ -44,22 +45,28 @@ public class TikaPipesConfigTest extends AbstractTikaConfigTest {
assertEquals(Paths.get("/my/base/path2"), ((FileSystemFetcher) f2).getBasePath());
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testDuplicateFetchers() throws Exception {
//can't have two fetchers with the same name
- FetcherManager.load(getConfigFilePath("fetchers-duplicate-config.xml"));
+ assertThrows(TikaConfigException.class, () -> {
+ FetcherManager.load(getConfigFilePath("fetchers-duplicate-config.xml"));
+ });
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testNoNameFetchers() throws Exception {
//can't have two fetchers with an empty name
- FetcherManager.load(getConfigFilePath("fetchers-noname-config.xml"));
+ assertThrows(TikaConfigException.class, () -> {
+ FetcherManager.load(getConfigFilePath("fetchers-noname-config.xml"));
+ });
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testNoBasePathFetchers() throws Exception {
//can't have an fs fetcher with no basepath specified
- FetcherManager.load(getConfigFilePath("fetchers-nobasepath-config.xml"));
+ assertThrows(TikaConfigException.class, () -> {
+ FetcherManager.load(getConfigFilePath("fetchers-nobasepath-config.xml"));
+ });
}
@Test
@@ -72,9 +79,11 @@ public class TikaPipesConfigTest extends AbstractTikaConfigTest {
assertNotNull(em2);
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testDuplicateEmitters() throws Exception {
- EmitterManager.load(getConfigFilePath("emitters-duplicate-config.xml"));
+ assertThrows(TikaConfigException.class, () -> {
+ EmitterManager.load(getConfigFilePath("emitters-duplicate-config.xml"));
+ });
}
@Test
@@ -84,11 +93,12 @@ public class TikaPipesConfigTest extends AbstractTikaConfigTest {
assertEquals("fs1", it.getFetcherName());
}
- @Test(expected = TikaConfigException.class)
+ @Test
public void testMultiplePipesIterators() throws Exception {
- PipesIterator it =
- PipesIterator.build(getConfigFilePath("pipes-iterator-multiple-config.xml"));
- assertEquals("fs1", it.getFetcherName());
+ assertThrows(TikaConfigException.class, () -> {
+ PipesIterator it =
+ PipesIterator.build(getConfigFilePath("pipes-iterator-multiple-config.xml"));
+ assertEquals("fs1", it.getFetcherName());
+ });
}
-
}
diff --git a/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java
index 27b437b..5ebf0d2 100644
--- a/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.detect;
-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.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.io.TikaInputStream;
@@ -33,7 +33,7 @@ public class FileCommandDetectorTest {
private static Detector DETECTOR;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
try (InputStream is = TikaConfig.class.getResourceAsStream("FileCommandDetector.xml")) {
DETECTOR = new TikaConfig(is).getDetector();
diff --git a/tika-core/src/test/java/org/apache/tika/detect/MagicDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/MagicDetectorTest.java
index e7956de..d965e21 100644
--- a/tika-core/src/test/java/org/apache/tika/detect/MagicDetectorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/detect/MagicDetectorTest.java
@@ -19,15 +19,15 @@ package org.apache.tika.detect;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.nio.charset.StandardCharsets.UTF_16BE;
import static java.nio.charset.StandardCharsets.UTF_16LE;
-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.ByteArrayInputStream;
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.metadata.Metadata;
import org.apache.tika.mime.MediaType;
diff --git a/tika-core/src/test/java/org/apache/tika/detect/MimeDetectionWithNNTest.java b/tika-core/src/test/java/org/apache/tika/detect/MimeDetectionWithNNTest.java
index 6404647..af7f56b 100644
--- a/tika-core/src/test/java/org/apache/tika/detect/MimeDetectionWithNNTest.java
+++ b/tika-core/src/test/java/org/apache/tika/detect/MimeDetectionWithNNTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.detect;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
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.metadata.Metadata;
import org.apache.tika.mime.MediaType;
@@ -36,7 +36,7 @@ public class MimeDetectionWithNNTest {
/**
* @inheritDoc
*/
- @Before
+ @BeforeEach
public void setUp() {
detector = new NNExampleModelDetector();
}
@@ -107,13 +107,14 @@ public class MimeDetectionWithNNTest {
try {
Metadata metadata = new Metadata();
String mime = this.detector.detect(in, metadata).toString();
- assertEquals(urlOrFileName + " is not properly detected: detected.", expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected: detected.");
// Add resource name and test again
// metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, urlOrFileName);
mime = this.detector.detect(in, metadata).toString();
- assertEquals(urlOrFileName + " is not properly detected after adding resource name.",
- expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected after adding resource name.");
} finally {
in.close();
}
diff --git a/tika-core/src/test/java/org/apache/tika/detect/NameDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/NameDetectorTest.java
index 69c8af3..a260869 100644
--- a/tika-core/src/test/java/org/apache/tika/detect/NameDetectorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/detect/NameDetectorTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.tika.detect;
-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.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
-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.metadata.TikaCoreProperties;
@@ -38,7 +38,7 @@ public class NameDetectorTest {
private Detector detector;
- @Before
+ @BeforeEach
public void setUp() {
Map<Pattern, MediaType> patterns = new HashMap<>();
patterns.put(Pattern.compile(".*\\.txt", Pattern.CASE_INSENSITIVE), MediaType.TEXT_PLAIN);
diff --git a/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java
index 9b1ae76..1870033 100644
--- a/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java
@@ -17,15 +17,15 @@
package org.apache.tika.detect;
import static java.nio.charset.StandardCharsets.UTF_8;
-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.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
diff --git a/tika-core/src/test/java/org/apache/tika/detect/TypeDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/TypeDetectorTest.java
index ccae19b..d79e9b7 100644
--- a/tika-core/src/test/java/org/apache/tika/detect/TypeDetectorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/detect/TypeDetectorTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.detect;
-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.IOException;
import java.util.Map;
import java.util.TreeMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
diff --git a/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java
index 3a7505f..8527116 100644
--- a/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/detect/ZeroSizeFileDetectorTest.java
@@ -17,15 +17,15 @@
package org.apache.tika.detect;
import static java.nio.charset.StandardCharsets.UTF_8;
-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.ByteArrayInputStream;
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.metadata.Metadata;
import org.apache.tika.mime.MediaType;
@@ -34,7 +34,7 @@ public class ZeroSizeFileDetectorTest {
private Detector detector;
- @Before
+ @BeforeEach
public void setUp() {
detector = new ZeroSizeFileDetector();
}
diff --git a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
index 6cfeb23..a386415 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.fork;
-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.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -42,7 +42,7 @@ import java.util.List;
import java.util.concurrent.Semaphore;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -203,7 +203,7 @@ public class ForkParserTest extends TikaTest {
o, m, c);
fail("should have thrown IOException");
} catch (TikaException e) {
- assertTrue("failed to communicate with forked parser process", true);
+ //failed to communicate with forked parser process"
}
//test setting very short pulse (10 ms) and a parser that takes at least 1000 ms
@@ -222,7 +222,7 @@ public class ForkParserTest extends TikaTest {
o, m, c);
fail("Should have thrown exception");
} catch (IOException | TikaException e) {
- assertTrue("should have thrown IOException lost connection", true);
+ //"should have thrown IOException lost connection"
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
index edb4e89..0300a7f 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.fork;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.io.InputStream;
@@ -35,9 +35,9 @@ import java.util.jar.JarOutputStream;
import com.google.common.reflect.ClassPath;
import org.apache.commons.io.IOUtils;
-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.ContentHandler;
import org.xml.sax.SAXException;
@@ -55,7 +55,7 @@ public class ForkParserTikaBinTest extends TikaTest {
private static Path JAR_DIR;
private static Path JAR_FILE;
- @BeforeClass
+ @BeforeAll
public static void bootstrapJar() throws Exception {
JAR_DIR = Files.createTempDirectory("tika-fork-tikabin-");
JAR_FILE = JAR_DIR.resolve(JAR_FILE_NAME);
@@ -105,7 +105,7 @@ public class ForkParserTikaBinTest extends TikaTest {
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
Files.delete(JAR_DIR.resolve("TIKA_2653-iou.xml"));
Files.delete(JAR_FILE);
diff --git a/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java b/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java
index e2b86b2..f2dc967 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java
@@ -16,12 +16,13 @@
*/
package org.apache.tika.fork;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.Set;
-import org.junit.Assert;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -61,7 +62,7 @@ class ForkTestParser extends AbstractParser {
@Override
public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
ParseContext context) throws IOException, SAXException, TikaException {
- Assert.assertNotNull(ClassInUnusedPackage.class.getPackage());
+ assertNotNull(ClassInUnusedPackage.class.getPackage());
super.parse(stream, handler, metadata, context);
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/io/EndianUtilsTest.java b/tika-core/src/test/java/org/apache/tika/io/EndianUtilsTest.java
index 8680f77..8ead232 100644
--- a/tika-core/src/test/java/org/apache/tika/io/EndianUtilsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/io/EndianUtilsTest.java
@@ -17,12 +17,12 @@
package org.apache.tika.io;
-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.ByteArrayInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class EndianUtilsTest {
@Test
diff --git a/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java b/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java
index 54d4cc3..0cc869a 100644
--- a/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.io;
-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 org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FilenameUtilsTest {
diff --git a/tika-core/src/test/java/org/apache/tika/io/LookaheadInputStreamTest.java b/tika-core/src/test/java/org/apache/tika/io/LookaheadInputStreamTest.java
index 77eb9eb..b6237b3 100644
--- a/tika-core/src/test/java/org/apache/tika/io/LookaheadInputStreamTest.java
+++ b/tika-core/src/test/java/org/apache/tika/io/LookaheadInputStreamTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.io;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the {@link LookaheadInputStream} class.
diff --git a/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java b/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java
index 0add6f3..cfe0c15 100644
--- a/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java
+++ b/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java
@@ -17,16 +17,15 @@
package org.apache.tika.io;
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.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test class for {@code TailStream}.
@@ -90,7 +89,7 @@ public class TailStreamTest {
@Test
public void testTailBeforeRead() throws IOException {
TailStream stream = new TailStream(generateStream(0, 100), 50);
- assertEquals("Wrong buffer length", 0, stream.getTail().length);
+ assertEquals(0, stream.getTail().length, "Wrong buffer length");
stream.close();
}
@@ -102,7 +101,7 @@ public class TailStreamTest {
final int count = 64;
TailStream stream = new TailStream(generateStream(0, count), 2 * count);
byte[] data = readStream(stream);
- assertTrue("Wrong content", Arrays.equals(data, stream.getTail()));
+ assertArrayEquals(data, stream.getTail(), "Wrong buffer length");
stream.close();
}
@@ -114,8 +113,8 @@ public class TailStreamTest {
final int count = 128;
TailStream stream = new TailStream(generateStream(0, 2 * count), count);
readStream(stream);
- assertEquals("Wrong buffer", generateText(count, count),
- new String(stream.getTail(), UTF_8));
+ assertEquals(generateText(count, count), new String(stream.getTail(), UTF_8),
+ "Wrong buffer");
}
/**
@@ -129,12 +128,12 @@ public class TailStreamTest {
TailStream stream = new TailStream(generateStream(0, count), tailSize);
byte[] buf = new byte[bufSize];
int read = stream.read(buf, 10, 8);
- assertEquals("Wrong number of bytes read", 8, read);
+ assertEquals(8, read, "Wrong number of bytes read");
while (read != -1) {
read = stream.read(buf);
}
- assertEquals("Wrong buffer", generateText(count - tailSize, tailSize),
- new String(stream.getTail(), UTF_8));
+ assertEquals(generateText(count - tailSize, tailSize),
+ new String(stream.getTail(), UTF_8), "Wrong buffer");
stream.close();
}
@@ -151,8 +150,8 @@ public class TailStreamTest {
stream.read(buf);
stream.reset();
readStream(stream);
- assertEquals("Wrong buffer", generateText(tailSize, tailSize),
- new String(stream.getTail(), UTF_8));
+ assertEquals(generateText(tailSize, tailSize),
+ new String(stream.getTail(), UTF_8), "Wrong buffer");
}
/**
@@ -166,8 +165,8 @@ public class TailStreamTest {
stream.reset();
byte[] buf = new byte[count];
stream.read(buf);
- assertEquals("Wrong buffer", generateText(count - tailSize, tailSize),
- new String(stream.getTail(), UTF_8));
+ assertEquals(generateText(count - tailSize, tailSize),
+ new String(stream.getTail(), UTF_8), "Wrong buffer");
stream.close();
}
@@ -180,9 +179,9 @@ public class TailStreamTest {
final int count = 1024;
final int skipCount = 512;
TailStream stream = new TailStream(generateStream(0, count), tailSize);
- assertEquals("Wrong skip result", skipCount, stream.skip(skipCount));
- assertEquals("Wrong buffer", generateText(skipCount - tailSize, tailSize),
- new String(stream.getTail(), UTF_8));
+ assertEquals(skipCount, stream.skip(skipCount), "Wrong skip result");
+ assertEquals(generateText(skipCount - tailSize, tailSize),
+ new String(stream.getTail(), UTF_8), "Wrong buffer");
stream.close();
}
@@ -193,8 +192,9 @@ public class TailStreamTest {
public void testSkipEOS() throws IOException {
final int count = 128;
TailStream stream = new TailStream(generateStream(0, count), 2 * count);
- assertEquals("Wrong skip result", count, stream.skip(2 * count));
- assertEquals("Wrong buffer", generateText(0, count), new String(stream.getTail(), UTF_8));
+ assertEquals(count, stream.skip(2 * count), "Wrong skip result");
+ assertEquals(generateText(0, count), new String(stream.getTail(), UTF_8),
+ "Wrong buffer");
stream.close();
}
@@ -206,6 +206,6 @@ public class TailStreamTest {
final int count = 128;
TailStream stream = new TailStream(generateStream(0, count), 2 * count);
readStream(stream);
- assertEquals("Wrong result", -1, stream.skip(1));
+ assertEquals(-1, stream.skip(1), "Wrong result");
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/io/TemporaryResourcesTest.java b/tika-core/src/test/java/org/apache/tika/io/TemporaryResourcesTest.java
index fdddd0b..fffb3f3 100644
--- a/tika-core/src/test/java/org/apache/tika/io/TemporaryResourcesTest.java
+++ b/tika-core/src/test/java/org/apache/tika/io/TemporaryResourcesTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.io;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TemporaryResourcesTest {
@@ -31,11 +31,10 @@ public class TemporaryResourcesTest {
Path tempFile;
try (TemporaryResources tempResources = new TemporaryResources()) {
tempFile = tempResources.createTempFile();
- assertTrue("Temp file should exist while TempResources is used",
- Files.exists(tempFile));
+ assertTrue(Files.exists(tempFile), "Temp file should exist while TempResources is used");
}
- assertTrue("Temp file should not exist after TempResources is closed",
- Files.notExists(tempFile));
+ assertTrue(Files.notExists(tempFile),
+ "Temp file should not exist after TempResources is closed");
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java b/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java
index 02d5cd8..c4b6041 100644
--- a/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java
+++ b/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java
@@ -17,11 +17,11 @@
package org.apache.tika.io;
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.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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.io.InputStream;
@@ -31,7 +31,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -46,16 +46,18 @@ public class TikaInputStreamTest {
assertNull(stream.getOpenContainer());
assertNull(stream.getInputStreamFactory());
- assertEquals("The file returned by the getFile() method should" +
- " be the file used to instantiate a TikaInputStream", path,
- TikaInputStream.get(stream).getPath());
+ assertEquals(path, TikaInputStream.get(stream).getPath(),
+ "The file returned by the getFile() method should" +
+ " be the file used to instantiate a TikaInputStream");
- assertEquals("The contents of the TikaInputStream should equal the" +
- " contents of the underlying file", "Hello, World!", readStream(stream));
+ assertEquals("Hello, World!", readStream(stream),
+ "The contents of the TikaInputStream should equal the" +
+ " contents of the underlying file");
stream.close();
- assertTrue("The close() method must not remove the file used to" +
- " instantiate a TikaInputStream", Files.exists(path));
+ assertTrue(Files.exists(path),
+ "The close() method must not remove the file used to" +
+ " instantiate a TikaInputStream");
Files.delete(path);
}
@@ -74,16 +76,17 @@ public class TikaInputStreamTest {
assertNull(stream.getOpenContainer());
assertNull(stream.getInputStreamFactory());
- assertEquals("The contents of the file returned by the getFile method" +
- " should equal the contents of the TikaInputStream", "Hello, World!",
- readFile(file));
+ assertEquals("Hello, World!", readFile(file),
+ "The contents of the file returned by the getFile method" +
+ " should equal the contents of the TikaInputStream");
- assertEquals("The contents of the TikaInputStream should not get modified" +
- " by reading the file first", "Hello, World!", readStream(stream));
+ assertEquals("Hello, World!", readStream(stream),
+ "The contents of the TikaInputStream should not get modified" +
+ " by reading the file first");
stream.close();
- assertFalse("The close() method must remove the temporary file created" +
- " by a TikaInputStream", Files.exists(file));
+ assertFalse(Files.exists(file),
+ "The close() method must remove the temporary file created by a TikaInputStream");
}
@Test
@@ -93,8 +96,9 @@ public class TikaInputStreamTest {
assertNull(stream.getOpenContainer());
assertNotNull(stream.getInputStreamFactory());
- assertEquals("The contents of the TikaInputStream should not get modified" +
- " by reading the file first", "Hello, World!", readStream(stream));
+ assertEquals("Hello, World!", readStream(stream),
+ "The contents of the TikaInputStream should not get modified" +
+ " by reading the file first");
stream.close();
}
diff --git a/tika-core/src/test/java/org/apache/tika/language/detect/LanguageNamesTest.java b/tika-core/src/test/java/org/apache/tika/language/detect/LanguageNamesTest.java
index 56a6436..a035574 100644
--- a/tika-core/src/test/java/org/apache/tika/language/detect/LanguageNamesTest.java
+++ b/tika-core/src/test/java/org/apache/tika/language/detect/LanguageNamesTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.language.detect;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class LanguageNamesTest {
diff --git a/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java b/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java
index b22e5a6..dad7126 100644
--- a/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java
+++ b/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java
@@ -16,14 +16,12 @@
*/
package org.apache.tika.metadata;
-//JDK imports
-
-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 java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -38,7 +36,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.apache.tika.utils.DateUtils;
@@ -377,13 +375,13 @@ public class TestMetadata {
// Set explictly without a timezone
meta.set(TikaCoreProperties.CREATED, "1970-01-01T00:00:01");
- assertEquals("should return string without time zone specifier because zone is not known",
- "1970-01-01T00:00:01", meta.get(TikaCoreProperties.CREATED));
+ assertEquals("1970-01-01T00:00:01", meta.get(TikaCoreProperties.CREATED),
+ "should return string without time zone specifier because zone is not known");
// Now ask DateUtils to format for us without one
meta.set(TikaCoreProperties.CREATED, DateUtils.formatDateUnknownTimezone(new Date(1000)));
- assertEquals("should return string without time zone specifier because zone is not known",
- "1970-01-01T00:00:01", meta.get(TikaCoreProperties.CREATED));
+ assertEquals("1970-01-01T00:00:01", meta.get(TikaCoreProperties.CREATED),
+ "should return string without time zone specifier because zone is not known");
}
/**
diff --git a/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java b/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java
index c7368df..88d510d 100644
--- a/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java
+++ b/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java
@@ -17,15 +17,15 @@
package org.apache.tika.metadata.filter;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
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.config.AbstractTikaConfigTest;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-core/src/test/java/org/apache/tika/mime/CustomReaderTest.java b/tika-core/src/test/java/org/apache/tika/mime/CustomReaderTest.java
index 6280876..988bf58 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/CustomReaderTest.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/CustomReaderTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.mime;
-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.ArrayList;
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -56,9 +56,7 @@ public class CustomReaderTest {
assertEquals(1, reader.ignorePatterns.size());
assertEquals(another.toString() + ">>*" + hello.getExtension(),
reader.ignorePatterns.get(0));
- assertTrue("Server-side script type not detected", another.isInterpreted());
-
- //System.out.println( mimeTypes.getMediaTypeRegistry().getTypes() );
+ assertTrue(another.isInterpreted(), "Server-side script type not detected");
}
static class CustomMimeTypesReader extends MimeTypesReader {
diff --git a/tika-core/src/test/java/org/apache/tika/mime/MediaTypeTest.java b/tika-core/src/test/java/org/apache/tika/mime/MediaTypeTest.java
index 607990c..64a2beb 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/MediaTypeTest.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/MediaTypeTest.java
@@ -17,14 +17,14 @@
package org.apache.tika.mime;
import static java.util.Collections.singletonMap;
-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.util.HashMap;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class MediaTypeTest {
diff --git a/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java b/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java
index 18148b7..b98d7fb 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java
@@ -19,16 +19,16 @@ package org.apache.tika.mime;
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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
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.config.TikaConfig;
import org.apache.tika.metadata.Metadata;
@@ -43,7 +43,7 @@ public class MimeDetectionTest {
/**
* @inheritDoc
*/
- @Before
+ @BeforeEach
public void setUp() {
this.mimeTypes = TikaConfig.getDefaultConfig().getMimeRepository();
this.registry = mimeTypes.getMediaTypeRegistry();
@@ -141,7 +141,8 @@ public class MimeDetectionTest {
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, url);
String mime = this.mimeTypes.detect(null, metadata).toString();
- assertEquals(url + " is not properly detected using only resource name", expected, mime);
+ assertEquals(expected, mime,
+ url + " is not properly detected using only resource name");
}
private void testUrl(String expected, String url, String file) throws IOException {
@@ -165,13 +166,14 @@ public class MimeDetectionTest {
try {
Metadata metadata = new Metadata();
String mime = this.mimeTypes.detect(in, metadata).toString();
- assertEquals(urlOrFileName + " is not properly detected: detected.", expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected: detected.");
//Add resource name and test again
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, urlOrFileName);
mime = this.mimeTypes.detect(in, metadata).toString();
- assertEquals(urlOrFileName + " is not properly detected after adding resource name.",
- expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected after adding resource name.");
} finally {
in.close();
}
diff --git a/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java b/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
index 485b978..abd71d7 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
@@ -17,10 +17,11 @@
package org.apache.tika.mime;
import static java.nio.charset.StandardCharsets.US_ASCII;
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -31,9 +32,9 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.Executors;
-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.config.TikaConfig;
import org.apache.tika.metadata.Metadata;
@@ -70,7 +71,7 @@ public class MimeTypesReaderTest {
}
@SuppressWarnings("unchecked")
- @Before
+ @BeforeEach
public void setUp() throws NoSuchFieldException, SecurityException, IllegalArgumentException,
IllegalAccessException {
this.mimeTypes = TikaConfig.getDefaultConfig().getMimeRepository();
@@ -82,7 +83,7 @@ public class MimeTypesReaderTest {
customMimeTypes = System.getProperty(MimeTypesFactory.CUSTOM_MIMES_SYS_PROP);
}
- @After
+ @AfterEach
public void tearDown() {
if (customMimeTypes == null) {
System.clearProperty(MimeTypesFactory.CUSTOM_MIMES_SYS_PROP);
@@ -98,8 +99,9 @@ public class MimeTypesReaderTest {
// Check on the type
MimeType html = mimeTypes.forName("text/html");
assertTrue(html.hasMagic());
- assertTrue("There should be at least " + minMatches + " HTML matches, found " +
- html.getMagics().size(), html.getMagics().size() >= minMatches);
+ assertTrue(html.getMagics().size() >= minMatches,
+ "There should be at least " + minMatches + " HTML matches, found " +
+ html.getMagics().size());
// Check on the overall magics
List<Magic> htmlMagics = new ArrayList<>();
@@ -109,8 +111,8 @@ public class MimeTypesReaderTest {
}
}
- assertTrue("There should be at least " + minMatches + " HTML matches, found " +
- htmlMagics.size(), htmlMagics.size() >= minMatches);
+ assertTrue(htmlMagics.size() >= minMatches,
+ "There should be at least " + minMatches + " HTML matches, found " + htmlMagics.size());
}
@Test
@@ -120,8 +122,9 @@ public class MimeTypesReaderTest {
// Check on the type
MimeType excel = mimeTypes.forName("application/vnd.ms-excel");
assertTrue(excel.hasMagic());
- assertTrue("There should be at least " + minMatches + " Excel matches, found " +
- excel.getMagics().size(), excel.getMagics().size() >= minMatches);
+ assertTrue(excel.getMagics().size() >= minMatches,
+ "There should be at least " + minMatches + " Excel matches, found " +
+ excel.getMagics().size());
// Check on the overall magics
List<Magic> excelMagics = new ArrayList<>();
@@ -131,8 +134,9 @@ public class MimeTypesReaderTest {
}
}
- assertTrue("There should be at least " + minMatches + " Excel matches, found " +
- excelMagics.size(), excelMagics.size() >= minMatches);
+ assertTrue(excel.getMagics().size() >= minMatches,
+ "There should be at least " + minMatches + " Excel matches, found " +
+ excelMagics.size());
}
/**
@@ -181,8 +185,8 @@ public class MimeTypesReaderTest {
// Parent has several children, for versions 2 through 4
Set<MediaType> mtBTreeChildren =
this.mimeTypes.getMediaTypeRegistry().getChildTypes(mtBTree);
- assertTrue(mtBTreeChildren.toString(), mtBTreeChildren.size() >= 3);
- assertTrue(mtBTreeChildren.toString(), mtBTreeChildren.contains(mtBTree4));
+ assertTrue(mtBTreeChildren.size() >= 3, mtBTreeChildren.toString());
+ assertTrue(mtBTreeChildren.contains(mtBTree4), mtBTreeChildren.toString());
// Parent of that has none
MediaType mtBD = this.mimeTypes.getMediaTypeRegistry().getSupertype(mtBTree);
@@ -346,32 +350,41 @@ public class MimeTypesReaderTest {
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadMinShouldMatch1() throws Exception {
System.setProperty(MimeTypesFactory.CUSTOM_MIMES_SYS_PROP,
"src/test/resources/org/apache/tika/mime/custom-mimetypes-badMinShouldMatch1.xml");
- MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+
+ assertThrows(IllegalArgumentException.class, () -> {
+ MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadMinShouldMatch2() throws Exception {
System.setProperty(MimeTypesFactory.CUSTOM_MIMES_SYS_PROP,
"src/test/resources/org/apache/tika/mime/custom-mimetypes-badMinShouldMatch2.xml");
- MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+ assertThrows(IllegalArgumentException.class, () -> {
+ MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+ });
}
- @Test(expected = NumberFormatException.class)
+ @Test
public void testBadMinShouldMatch3() throws Exception {
System.setProperty(MimeTypesFactory.CUSTOM_MIMES_SYS_PROP,
"src/test/resources/org/apache/tika/mime/custom-mimetypes-badMinShouldMatch3.xml");
- MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+ assertThrows(IllegalArgumentException.class, () -> {
+ MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadMinShouldMatch4() throws Exception {
System.setProperty(MimeTypesFactory.CUSTOM_MIMES_SYS_PROP,
"src/test/resources/org/apache/tika/mime/custom-mimetypes-badMinShouldMatch4.xml");
- MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+ assertThrows(IllegalArgumentException.class, () -> {
+ MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes(new CustomClassLoader());
+ });
}
private static class CustomClassLoader extends ClassLoader {
diff --git a/tika-core/src/test/java/org/apache/tika/mime/PatternsTest.java b/tika-core/src/test/java/org/apache/tika/mime/PatternsTest.java
index 0c452e5..25721b1 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/PatternsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/PatternsTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.mime;
-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.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class PatternsTest {
private final MimeTypes fullTypes = MimeTypes.getDefaultMimeTypes();
@@ -32,7 +32,7 @@ public class PatternsTest {
private MimeTypes types;
private MimeType text;
- @Before
+ @BeforeEach
public void setUp() throws MimeTypeException {
patterns = new Patterns(new MediaTypeRegistry());
types = new MimeTypes();
diff --git a/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTest.java b/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTest.java
index c73901b..437cefc 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTest.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTest.java
@@ -19,8 +19,8 @@ package org.apache.tika.mime;
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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -28,8 +28,8 @@ import java.io.InputStream;
import java.net.URL;
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.metadata.TikaCoreProperties;
@@ -43,7 +43,7 @@ public class ProbabilisticMimeDetectionTest {
/**
* @inheritDoc
*/
- @Before
+ @BeforeEach
public void setUp() {
proDetector = new ProbabilisticMimeDetectionSelector();
this.registry = proDetector.getMediaTypeRegistry();
@@ -142,13 +142,14 @@ public class ProbabilisticMimeDetectionTest {
try {
Metadata metadata = new Metadata();
String mime = this.proDetector.detect(in, metadata).toString();
- assertEquals(urlOrFileName + " is not properly detected: detected.", expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected: detected.");
// Add resource name and test again
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, urlOrFileName);
mime = this.proDetector.detect(in, metadata).toString();
- assertEquals(urlOrFileName + " is not properly detected after adding resource name.",
- expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected after adding resource name.");
} finally {
in.close();
}
diff --git a/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTestWithTika.java b/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTestWithTika.java
index aa1e5ba..69ef03a 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTestWithTika.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTestWithTika.java
@@ -19,17 +19,17 @@ package org.apache.tika.mime;
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.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.ByteArrayInputStream;
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.ServiceLoader;
@@ -47,7 +47,7 @@ public class ProbabilisticMimeDetectionTestWithTika {
/**
* @inheritDoc
*/
- @Before
+ @BeforeEach
public void setUp() {
MimeTypes types = MimeTypes.getDefaultMimeTypes();
ServiceLoader loader = new ServiceLoader();
@@ -157,7 +157,7 @@ public class ProbabilisticMimeDetectionTestWithTika {
private void testStream(String expected, String urlOrFileName, InputStream in)
throws IOException {
- assertNotNull("Test stream: [" + urlOrFileName + "] is null!", in);
+ assertNotNull(in, "Test stream: [" + urlOrFileName + "] is null!");
if (!in.markSupported()) {
in = new java.io.BufferedInputStream(in);
}
@@ -165,14 +165,15 @@ public class ProbabilisticMimeDetectionTestWithTika {
Metadata metadata = new Metadata();
// String mime = this.proDetector.detect(in, metadata).toString();
String mime = tika.detect(in, metadata);
- assertEquals(urlOrFileName + " is not properly detected: detected.", expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected: detected.");
// Add resource name and test again
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, urlOrFileName);
// mime = this.proDetector.detect(in, metadata).toString();
mime = tika.detect(in, metadata);
- assertEquals(urlOrFileName + " is not properly detected after adding resource name.",
- expected, mime);
+ assertEquals(expected, mime,
+ urlOrFileName + " is not properly detected after adding resource name.");
} finally {
in.close();
}
diff --git a/tika-core/src/test/java/org/apache/tika/parser/CompositeParserTest.java b/tika-core/src/test/java/org/apache/tika/parser/CompositeParserTest.java
index 08db7a5..5519dce 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/CompositeParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/CompositeParserTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.parser;
-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.util.Collections;
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-core/src/test/java/org/apache/tika/parser/InitializableParserTest.java b/tika-core/src/test/java/org/apache/tika/parser/InitializableParserTest.java
index 6053339..9571ab2 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/InitializableParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/InitializableParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.net.URL;
import java.nio.charset.StandardCharsets;
-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-core/src/test/java/org/apache/tika/parser/ParameterizedParserTest.java b/tika-core/src/test/java/org/apache/tika/parser/ParameterizedParserTest.java
index 595d6cb..7ad198f 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/ParameterizedParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/ParameterizedParserTest.java
@@ -16,17 +16,16 @@
*/
package org.apache.tika.parser;
-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.assertThrows;
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.apache.tika.Tika;
@@ -61,8 +60,8 @@ public class ParameterizedParserTest {
public void testConfigurableParserTypes() throws Exception {
Metadata md = getMetadata("TIKA-1986-parameterized.xml");
for (Map.Entry<String, String> entry : expcted.entrySet()) {
- assertEquals("mismatch for " + entry.getKey(), entry.getValue(),
- md.get(entry.getKey()));
+ assertEquals(entry.getValue(),
+ md.get(entry.getKey()), "mismatch for " + entry.getKey());
}
}
@@ -70,8 +69,8 @@ public class ParameterizedParserTest {
public void testConfigurableParserTypesDecorated() throws Exception {
Metadata md = getMetadata("TIKA-1986-parameterized-decorated.xml");
for (Map.Entry<String, String> entry : expcted.entrySet()) {
- assertEquals("mismatch for " + entry.getKey(), entry.getValue(),
- md.get(entry.getKey()));
+ assertEquals(entry.getValue(),
+ md.get(entry.getKey()), "mismatch for " + entry.getKey());
}
}
@@ -88,26 +87,16 @@ public class ParameterizedParserTest {
@Test
public void testBadValue() throws Exception {
- boolean ex = false;
- try {
- Metadata m = getMetadata("TIKA-1986-bad-values.xml");
- fail("should have thrown exception");
- } catch (TikaConfigException e) {
- ex = true;
- }
- assertTrue("No TikaConfigException", ex);
+ assertThrows(TikaConfigException.class, () -> {
+ getMetadata("TIKA-1986-bad-values.xml");
+ });
}
@Test
public void testBadType() throws Exception {
- boolean ex = false;
- try {
- Metadata m = getMetadata("TIKA-1986-bad-types.xml");
- fail("should have thrown exception");
- } catch (TikaConfigException e) {
- ex = true;
- }
- assertTrue("No RuntimeException", ex);
+ assertThrows(TikaConfigException.class, () -> {
+ getMetadata("TIKA-1986-bad-types.xml");
+ });
}
//TODO later -- add a test for a parser that isn't configurable
@@ -115,7 +104,7 @@ public class ParameterizedParserTest {
private Metadata getMetadata(String name) throws TikaException, IOException, SAXException {
URL url = this.getClass().getResource("/org/apache/tika/config/" + name);
- assertNotNull("couldn't find: " + name, url);
+ assertNotNull(url, "couldn't find: " + name);
TikaConfig tikaConfig = new TikaConfig(url);
Tika tika = new Tika(tikaConfig);
Metadata metadata = new Metadata();
diff --git a/tika-core/src/test/java/org/apache/tika/parser/ParserDecoratorTest.java b/tika-core/src/test/java/org/apache/tika/parser/ParserDecoratorTest.java
index ca77de2..141c058 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/ParserDecoratorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/ParserDecoratorTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.tika.parser;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.util.Arrays;
@@ -25,13 +26,14 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.sax.BodyContentHandler;
public class ParserDecoratorTest {
+
@Test
public void withAndWithoutTypes() {
Set<MediaType> onlyTxt = Collections.singleton(MediaType.TEXT_PLAIN);
@@ -49,14 +51,14 @@ public class ParserDecoratorTest {
p = ParserDecorator.withTypes(EmptyParser.INSTANCE, onlyTxt);
types = p.getSupportedTypes(context);
assertEquals(1, types.size());
- assertEquals(types.toString(), true, types.contains(MediaType.TEXT_PLAIN));
+ assertTrue(types.contains(MediaType.TEXT_PLAIN), types.toString());
// With a parser with other types, still just the decorated type
p = ParserDecorator
.withTypes(new DummyParser(onlyOct, new HashMap<>(), ""), onlyTxt);
types = p.getSupportedTypes(context);
assertEquals(1, types.size());
- assertEquals(types.toString(), true, types.contains(MediaType.TEXT_PLAIN));
+ assertTrue(types.contains(MediaType.TEXT_PLAIN), types.toString());
// Exclude will remove if there
@@ -68,13 +70,13 @@ public class ParserDecoratorTest {
.withoutTypes(new DummyParser(onlyOct, new HashMap<>(), ""), onlyTxt);
types = p.getSupportedTypes(context);
assertEquals(1, types.size());
- assertEquals(types.toString(), true, types.contains(MediaType.OCTET_STREAM));
+ assertTrue(types.contains(MediaType.OCTET_STREAM), types.toString());
p = ParserDecorator
.withoutTypes(new DummyParser(both, new HashMap<>(), ""), onlyTxt);
types = p.getSupportedTypes(context);
assertEquals(1, types.size());
- assertEquals(types.toString(), true, types.contains(MediaType.OCTET_STREAM));
+ assertTrue(types.contains(MediaType.OCTET_STREAM), types.toString());
}
/**
@@ -101,8 +103,8 @@ public class ParserDecoratorTest {
// Will claim to support the types given, not those on the child parsers
Set<MediaType> types = p.getSupportedTypes(context);
assertEquals(2, types.size());
- assertEquals(types.toString(), true, types.contains(MediaType.TEXT_PLAIN));
- assertEquals(types.toString(), true, types.contains(MediaType.OCTET_STREAM));
+ assertTrue(types.contains(MediaType.TEXT_PLAIN), types.toString());
+ assertTrue(types.contains(MediaType.OCTET_STREAM), types.toString());
// Parsing will make it to the second one
metadata = new Metadata();
diff --git a/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java b/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
index ade8b90..1902b08 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
@@ -18,7 +18,7 @@ package org.apache.tika.parser.mock;
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-core/src/test/java/org/apache/tika/parser/multiple/MultipleParserTest.java b/tika-core/src/test/java/org/apache/tika/parser/multiple/MultipleParserTest.java
index 7a2a1d6..9462d0c 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/multiple/MultipleParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/multiple/MultipleParserTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.parser.multiple;
-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.ByteArrayInputStream;
import java.util.Arrays;
@@ -28,7 +28,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
diff --git a/tika-core/src/test/java/org/apache/tika/pipes/async/AsyncProcessorTest.java b/tika-core/src/test/java/org/apache/tika/pipes/async/AsyncProcessorTest.java
index 24ed318..ccab5b0 100644
--- a/tika-core/src/test/java/org/apache/tika/pipes/async/AsyncProcessorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/pipes/async/AsyncProcessorTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.pipes.async;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -28,9 +28,9 @@ import java.util.Random;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-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.pipes.FetchEmitTuple;
@@ -68,7 +68,7 @@ public class AsyncProcessorTest {
private int crash = 0;
- @Before
+ @BeforeEach
public void setUp() throws SQLException, IOException {
inputDir = Files.createTempDirectory("tika-async-");
tikaConfigPath = Files.createTempFile("tika-config-", ".xml");
@@ -120,7 +120,7 @@ public class AsyncProcessorTest {
}
}
*/
- @After
+ @AfterEach
public void tearDown() throws SQLException, IOException {
Files.delete(tikaConfigPath);
FileUtils.deleteDirectory(inputDir.toFile());
diff --git a/tika-core/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java b/tika-core/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java
index 36dfdaf..7e29ac2 100644
--- a/tika-core/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java
+++ b/tika-core/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.tika.pipes.fetcher.fs;
-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.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.InitializableProblemHandler;
@@ -44,11 +45,13 @@ public class FileSystemFetcherTest {
assertFalse(FileSystemFetcher.isDescendant(root, descendant));
}
- @Test(expected = InvalidPathException.class)
+ @Test
public void testNullByte() throws Exception {
FileSystemFetcher f = new FileSystemFetcher();
- f.setBasePath("bad\u0000path");
- f.setName("fs");
- f.checkInitialization(InitializableProblemHandler.IGNORE);
+ assertThrows(InvalidPathException.class, () -> {
+ f.setBasePath("bad\u0000path");
+ f.setName("fs");
+ f.checkInitialization(InitializableProblemHandler.IGNORE);
+ });
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java b/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java
index d0ee652..7b37ec5 100644
--- a/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.pipes.pipesiterator;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.net.URL;
@@ -29,7 +29,8 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.apache.tika.pipes.FetchEmitTuple;
import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
@@ -47,7 +48,8 @@ public class FileSystemPipesIteratorTest {
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void testBasic() throws Exception {
URL url =
FileSystemPipesIteratorTest.class.getResource("/test-documents");
@@ -70,10 +72,10 @@ public class FileSystemPipesIteratorTest {
}
for (String t : truthSet) {
- assertTrue("missing in iterator set " + t, iteratorSet.contains(t));
+ assertTrue(iteratorSet.contains(t), "missing in iterator set " + t);
}
for (String i : iteratorSet) {
- assertTrue("missing in truth set " + i, truthSet.contains(i));
+ assertTrue(truthSet.contains(i), "missing in truth set " + i);
}
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/filelist/FileListPipesIteratorTest.java b/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/filelist/FileListPipesIteratorTest.java
index daff86c..fec827d 100644
--- a/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/filelist/FileListPipesIteratorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/filelist/FileListPipesIteratorTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.pipes.pipesiterator.filelist;
-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.assertFalse;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.InitializableProblemHandler;
import org.apache.tika.pipes.FetchEmitTuple;
diff --git a/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java b/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java
index 904af33..f64c85c 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.sax;
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.ByteArrayOutputStream;
import java.io.IOException;
@@ -27,7 +27,7 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -52,7 +52,7 @@ public class BasicContentHandlerFactoryTest {
//copied from TikaTest in tika-parsers package
public static void assertNotContains(String needle, String haystack) {
- assertFalse(needle + " found in:\n" + haystack, haystack.contains(needle));
+ assertFalse(haystack.contains(needle), needle + " found in:\n" + haystack);
}
public static void assertNotContains(String needle, byte[] hayStack)
@@ -61,7 +61,7 @@ public class BasicContentHandlerFactoryTest {
}
public static void assertContains(String needle, String haystack) {
- assertTrue(needle + " not found in:\n" + haystack, haystack.contains(needle));
+ assertTrue(haystack.contains(needle), needle + " not found in:\n" + haystack);
}
public static void assertContains(String needle, byte[] hayStack)
@@ -275,7 +275,7 @@ public class BasicContentHandlerFactoryTest {
}
wlr = true;
}
- assertTrue("WriteLimitReached", wlr);
+ assertTrue(wlr, "WriteLimitReached");
}
//TODO: is there a better way than to repeat this with diff signature?
@@ -290,7 +290,7 @@ public class BasicContentHandlerFactoryTest {
wlr = true;
}
- assertTrue("WriteLimitReached", wlr);
+ assertTrue(wlr, "WriteLimitReached");
}
//Simple mockparser that writes a title
diff --git a/tika-core/src/test/java/org/apache/tika/sax/BodyContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/BodyContentHandlerTest.java
index 52ae45d..b41cc53 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/BodyContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/BodyContentHandlerTest.java
@@ -17,13 +17,13 @@
package org.apache.tika.sax;
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.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-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-core/src/test/java/org/apache/tika/sax/LinkContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/LinkContentHandlerTest.java
index 5f4333b..3ad2978 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/LinkContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/LinkContentHandlerTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.sax;
-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.helpers.AttributesImpl;
/**
diff --git a/tika-core/src/test/java/org/apache/tika/sax/OfflineContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/OfflineContentHandlerTest.java
index f844bbf..e29863f 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/OfflineContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/OfflineContentHandlerTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.sax;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.StringReader;
import java.net.ConnectException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.DefaultHandler;
@@ -37,7 +37,7 @@ public class OfflineContentHandlerTest {
private DefaultHandler offline;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
parser = SAXParserFactory.newInstance().newSAXParser();
offline = new OfflineContentHandler(new DefaultHandler());
diff --git a/tika-core/src/test/java/org/apache/tika/sax/RichTextContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/RichTextContentHandlerTest.java
index 6f8216a..d2de11a 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/RichTextContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/RichTextContentHandlerTest.java
@@ -17,13 +17,13 @@
package org.apache.tika.sax;
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.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.helpers.AttributesImpl;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-core/src/test/java/org/apache/tika/sax/SafeContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/SafeContentHandlerTest.java
index 52421df..80d1bfd 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/SafeContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/SafeContentHandlerTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.tika.sax;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-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.xml.sax.SAXException;
@@ -32,7 +32,7 @@ public class SafeContentHandlerTest {
private ContentHandler safe;
- @Before
+ @BeforeEach
public void setUp() {
output = new WriteOutContentHandler();
safe = new SafeContentHandler(output);
diff --git a/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java
index 38c5a41..421e6c2 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.sax;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import org.apache.commons.io.input.NullInputStream;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.DefaultHandler;
@@ -41,7 +41,7 @@ public class SecureContentHandlerTest {
private SecureContentHandler handler;
- @Before
+ @BeforeEach
public void setUp() {
stream = TikaInputStream.get(new NullInputStream(MANY_BYTES));
handler = new SecureContentHandler(new DefaultHandler(), stream);
diff --git a/tika-core/src/test/java/org/apache/tika/sax/SerializerTest.java b/tika-core/src/test/java/org/apache/tika/sax/SerializerTest.java
index fab12a1..361b88d 100755
--- a/tika-core/src/test/java/org/apache/tika/sax/SerializerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/SerializerTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.sax;
-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.xml.sax.helpers.AttributesImpl;
diff --git a/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java
index ab044c1..136c62b 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.sax;
-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.util.ArrayList;
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.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -58,7 +58,7 @@ public class XHTMLContentHandlerTest {
return words.toArray(new String[0]);
}
- @Before
+ @BeforeEach
public void setUp() {
output = new BodyContentHandler();
xhtml = new XHTMLContentHandler(output, new Metadata());
diff --git a/tika-core/src/test/java/org/apache/tika/sax/xpath/XPathParserTest.java b/tika-core/src/test/java/org/apache/tika/sax/xpath/XPathParserTest.java
index c87f673..2a3f1d4 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/xpath/XPathParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/xpath/XPathParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.sax.xpath;
-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 org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class XPathParserTest {
@@ -29,7 +29,7 @@ public class XPathParserTest {
private XPathParser parser;
- @Before
+ @BeforeEach
public void setUp() {
parser = new XPathParser();
parser.addPrefix(null, null);
diff --git a/tika-core/src/test/java/org/apache/tika/utils/AnnotationUtilsTest.java b/tika-core/src/test/java/org/apache/tika/utils/AnnotationUtilsTest.java
index 2b7997c..1f05631 100644
--- a/tika-core/src/test/java/org/apache/tika/utils/AnnotationUtilsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/utils/AnnotationUtilsTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.tika.utils;
+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.util.Date;
import java.util.HashMap;
import java.util.Map;
import aQute.bnd.annotation.metatype.Configurable;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.Field;
import org.apache.tika.config.Param;
@@ -48,17 +51,17 @@ public class AnnotationUtilsTest {
MyParser bean = new MyParser();
AnnotationUtils.assignFieldParams(bean, params);
- Assert.assertEquals(bean.config, 1);
+ assertEquals(bean.config, 1);
} catch (TikaConfigException e) {
e.printStackTrace();
- Assert.fail("Exception Not expected");
+ fail("Exception Not expected");
}
params.clear();
try {
params.put("config", new Param<>("config", "a string value"));
AnnotationUtils.assignFieldParams(new MyParser(), params);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (TikaConfigException e) {
//expected
}
@@ -80,11 +83,11 @@ public class AnnotationUtilsTest {
int val = 100;
params.put("config", new Param<>("config", val));
AnnotationUtils.assignFieldParams(bean, params);
- Assert.assertTrue(bean.config == bean.config2);
- Assert.assertTrue(bean.config == val);
+ assertTrue(bean.config == bean.config2);
+ assertTrue(bean.config == val);
} catch (TikaConfigException e) {
e.printStackTrace();
- Assert.fail("Exception Not expected");
+ fail("Exception Not expected");
}
}
@@ -103,16 +106,16 @@ public class AnnotationUtilsTest {
try {
MyParser bean = new MyParser();
AnnotationUtils.assignFieldParams(bean, params);
- Assert.assertEquals(bean.config, someval);
+ assertEquals(bean.config, someval);
} catch (TikaConfigException e) {
e.printStackTrace();
- Assert.fail("Exception Not expected");
+ fail("Exception Not expected");
}
params.clear();
try {
AnnotationUtils.assignFieldParams(new MyParser(), params);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (TikaConfigException e) {
//expected
}
@@ -146,18 +149,18 @@ public class AnnotationUtilsTest {
try {
Child child = new Child();
AnnotationUtils.assignFieldParams(child, params);
- Assert.assertEquals(child.overridden, val);
- Assert.assertEquals(child.parentField, val);
- Assert.assertEquals(child.childField, val);
+ assertEquals(child.overridden, val);
+ assertEquals(child.parentField, val);
+ assertEquals(child.childField, val);
} catch (TikaConfigException e) {
e.printStackTrace();
- Assert.fail("Exception Not expected");
+ fail("Exception Not expected");
}
try {
params.remove("parentField");
AnnotationUtils.assignFieldParams(new Child(), params);
- Assert.fail("Exception expected, parent class field not set");
+ fail("Exception expected, parent class field not set");
} catch (TikaConfigException e) {
//expected
}
@@ -178,17 +181,17 @@ public class AnnotationUtilsTest {
String val = "someval";
params.put("field", new Param<>("field", String.class, val));
AnnotationUtils.assignFieldParams(parser, params);
- Assert.assertEquals(val, parser.field);
+ assertEquals(val, parser.field);
} catch (Exception e) {
e.printStackTrace();
- Assert.fail("Exception not expected, string is assignable to CharSequence");
+ fail("Exception not expected, string is assignable to CharSequence");
}
try {
Date val = new Date();
params.put("field", new Param<>("field", Date.class, val));
AnnotationUtils.assignFieldParams(parser, params);
- Assert.fail("Exception expected, Date is not assignable to CharSequence.");
+ fail("Exception expected, Date is not assignable to CharSequence.");
} catch (TikaConfigException e) {
//expected
diff --git a/tika-core/src/test/java/org/apache/tika/utils/CharsetUtilsTest.java b/tika-core/src/test/java/org/apache/tika/utils/CharsetUtilsTest.java
index cc9bf6a..8a6574a 100644
--- a/tika-core/src/test/java/org/apache/tika/utils/CharsetUtilsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/utils/CharsetUtilsTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.tika.utils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+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 org.junit.jupiter.api.Test;
public class CharsetUtilsTest {
diff --git a/tika-core/src/test/java/org/apache/tika/utils/ConcurrentUtilsTest.java b/tika-core/src/test/java/org/apache/tika/utils/ConcurrentUtilsTest.java
index 5c83919..6ac9d72 100644
--- a/tika-core/src/test/java/org/apache/tika/utils/ConcurrentUtilsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/utils/ConcurrentUtilsTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.utils;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.parser.ParseContext;
diff --git a/tika-core/src/test/java/org/apache/tika/utils/RegexUtilsTest.java b/tika-core/src/test/java/org/apache/tika/utils/RegexUtilsTest.java
index 79c18d7..030836e 100644
--- a/tika-core/src/test/java/org/apache/tika/utils/RegexUtilsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/utils/RegexUtilsTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.utils;
-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.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for {@link RegexUtils}.
@@ -63,10 +63,11 @@ public class RegexUtilsTest {
"What about www.google.com at http://www.google.de " +
"A longer URL could be http://www.sybit.com/solutions/portals.html");
- assertTrue("Url not found!", links.size() == 3);
- assertEquals("Wrong URL", "http://www.nutch.org/index.html", links.get(0));
- assertEquals("Wrong URL", "http://www.google.de", links.get(1));
- assertEquals("Wrong URL", "http://www.sybit.com/solutions/portals.html", links.get(2));
+ assertTrue(links.size() == 3, "Url not found!");
+ assertEquals("http://www.nutch.org/index.html", links.get(0), "Wrong URL");
+ assertEquals("http://www.google.de", links.get(1), "Wrong URL");
+ assertEquals("http://www.sybit.com/solutions/portals.html", links.get(2),
+ "Wrong URL");
}
/**
@@ -77,8 +78,8 @@ public class RegexUtilsTest {
List<String> links = RegexUtils.extractLinks("Test with ftp://www.nutch.org is it found? " +
"What about www.google.com at ftp://www.google.de");
- assertTrue("Url not found!", links.size() == 2);
- assertEquals("Wrong URL", "ftp://www.nutch.org", links.get(0));
- assertEquals("Wrong URL", "ftp://www.google.de", links.get(1));
+ assertTrue(links.size() == 2, "Url not found!");
+ assertEquals("ftp://www.nutch.org", links.get(0), "Wrong URL");
+ assertEquals("ftp://www.google.de", links.get(1), "Wrong URL");
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java b/tika-core/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
index 269e77c..199c003 100644
--- a/tika-core/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
+++ b/tika-core/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.utils;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Random;
import org.apache.custom.detect.MyCustomDetector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.detect.Detector;
import org.apache.tika.detect.EmptyDetector;
@@ -49,8 +49,7 @@ public class ServiceLoaderUtilsTest {
for (int i = 0; i < 10; i++) {
Collections.shuffle(shuffled, random);
ServiceLoaderUtils.sortLoadedClasses(shuffled);
- assertEquals("failed on iteration " + i, expected, shuffled);
-
+ assertEquals(expected, shuffled, "failed on iteration " + i);
}
}