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/28 15:36:59 UTC
[tika] branch main updated (35ecfdc -> 163dd47)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 35ecfdc Merge remote-tracking branch 'origin/main' into main
new f462576 TIKA-3499 -- tika-serialization
new 163dd47 TIKA-3499 -- tika-server
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tika-serialization/pom.xml | 8 -------
.../serialization/JsonFetchEmitTupleListTest.java | 4 ++--
.../serialization/JsonFetchEmitTupleTest.java | 4 ++--
.../serialization/JsonMetadataListTest.java | 8 +++----
.../metadata/serialization/JsonMetadataTest.java | 8 +++----
tika-server/pom.xml | 9 -------
.../org/apache/tika/server/client/TestBasic.java | 8 +++----
.../org/apache/tika/server/core/CXFTestBase.java | 18 +++++++-------
.../tika/server/core/IntegrationTestBase.java | 16 ++++++-------
.../tika/server/core/LanguageResourceTest.java | 6 ++---
.../server/core/RecursiveMetadataResourceTest.java | 4 ++--
.../apache/tika/server/core/ServerStatusTest.java | 17 ++++++++-----
.../apache/tika/server/core/StackTraceOffTest.java | 28 +++++++++++-----------
.../apache/tika/server/core/StackTraceTest.java | 23 +++++++++---------
.../apache/tika/server/core/TikaMimeTypesTest.java | 2 +-
.../org/apache/tika/server/core/TikaPipesTest.java | 24 +++++++++----------
.../core/TikaResourceMetadataFilterTest.java | 6 ++---
.../tika/server/core/TikaResourceNoStackTest.java | 4 ++--
.../apache/tika/server/core/TikaResourceTest.java | 6 ++---
.../core/TikaServerAsyncIntegrationTest.java | 22 ++++++++---------
.../tika/server/core/TikaServerConfigTest.java | 6 ++---
.../server/core/TikaServerIntegrationTest.java | 22 +++++++++--------
.../core/TikaServerPipesIntegrationTest.java | 26 ++++++++++----------
.../tika/server/core/TikaServerStatusTest.java | 6 ++---
.../apache/tika/server/core/TikaVersionTest.java | 4 ++--
.../apache/tika/server/core/TikaWelcomeTest.java | 2 +-
.../tika/server/core/TranslateResourceTest.java | 6 ++---
.../tika/server/standard/DetectorResourceTest.java | 6 ++---
.../apache/tika/server/standard/FetcherTest.java | 8 +++----
.../tika/server/standard/MetadataResourceTest.java | 24 ++++++++-----------
.../standard/RecursiveMetadataFilterTest.java | 8 +++----
.../standard/RecursiveMetadataResourceTest.java | 10 ++++----
.../tika/server/standard/TikaDetectorsTest.java | 6 ++---
.../tika/server/standard/TikaMimeTypesTest.java | 12 +++++-----
.../tika/server/standard/TikaParsersTest.java | 6 ++---
.../tika/server/standard/TikaResourceTest.java | 8 +++----
.../tika/server/standard/UnpackerResourceTest.java | 14 +++++------
37 files changed, 192 insertions(+), 207 deletions(-)
[tika] 02/02: TIKA-3499 -- tika-server
Posted by ta...@apache.org.
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 163dd47d12586d3e99dec25a0e3af187b48b1299
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 28 11:36:43 2021 -0400
TIKA-3499 -- tika-server
---
tika-server/pom.xml | 9 -------
.../org/apache/tika/server/client/TestBasic.java | 8 +++----
.../org/apache/tika/server/core/CXFTestBase.java | 18 +++++++-------
.../tika/server/core/IntegrationTestBase.java | 16 ++++++-------
.../tika/server/core/LanguageResourceTest.java | 6 ++---
.../server/core/RecursiveMetadataResourceTest.java | 4 ++--
.../apache/tika/server/core/ServerStatusTest.java | 17 ++++++++-----
.../apache/tika/server/core/StackTraceOffTest.java | 28 +++++++++++-----------
.../apache/tika/server/core/StackTraceTest.java | 23 +++++++++---------
.../apache/tika/server/core/TikaMimeTypesTest.java | 2 +-
.../org/apache/tika/server/core/TikaPipesTest.java | 24 +++++++++----------
.../core/TikaResourceMetadataFilterTest.java | 6 ++---
.../tika/server/core/TikaResourceNoStackTest.java | 4 ++--
.../apache/tika/server/core/TikaResourceTest.java | 6 ++---
.../core/TikaServerAsyncIntegrationTest.java | 22 ++++++++---------
.../tika/server/core/TikaServerConfigTest.java | 6 ++---
.../server/core/TikaServerIntegrationTest.java | 22 +++++++++--------
.../core/TikaServerPipesIntegrationTest.java | 26 ++++++++++----------
.../tika/server/core/TikaServerStatusTest.java | 6 ++---
.../apache/tika/server/core/TikaVersionTest.java | 4 ++--
.../apache/tika/server/core/TikaWelcomeTest.java | 2 +-
.../tika/server/core/TranslateResourceTest.java | 6 ++---
.../tika/server/standard/DetectorResourceTest.java | 6 ++---
.../apache/tika/server/standard/FetcherTest.java | 8 +++----
.../tika/server/standard/MetadataResourceTest.java | 24 ++++++++-----------
.../standard/RecursiveMetadataFilterTest.java | 8 +++----
.../standard/RecursiveMetadataResourceTest.java | 10 ++++----
.../tika/server/standard/TikaDetectorsTest.java | 6 ++---
.../tika/server/standard/TikaMimeTypesTest.java | 12 +++++-----
.../tika/server/standard/TikaParsersTest.java | 6 ++---
.../tika/server/standard/TikaResourceTest.java | 8 +++----
.../tika/server/standard/UnpackerResourceTest.java | 14 +++++------
32 files changed, 180 insertions(+), 187 deletions(-)
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 2579ee6..0acc218 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -33,15 +33,6 @@
<name>Apache Tika server module</name>
<url>https://tika.apache.org/</url>
<packaging>pom</packaging>
- <dependencies>
- <!-- after we migrate everything to junit5, we can get rid of this -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
diff --git a/tika-server/tika-server-client/src/test/java/org/apache/tika/server/client/TestBasic.java b/tika-server/tika-server-client/src/test/java/org/apache/tika/server/client/TestBasic.java
index 4f4eeb5..d2b844e 100644
--- a/tika-server/tika-server-client/src/test/java/org/apache/tika/server/client/TestBasic.java
+++ b/tika-server/tika-server-client/src/test/java/org/apache/tika/server/client/TestBasic.java
@@ -16,16 +16,16 @@
*/
package org.apache.tika.server.client;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("turn into actual unit test")
+@Disabled("turn into actual unit test")
public class TestBasic {
@Test
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/CXFTestBase.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/CXFTestBase.java
index d97263f..05131c9 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/CXFTestBase.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/CXFTestBase.java
@@ -18,8 +18,8 @@
package org.apache.tika.server.core;
import static java.nio.charset.StandardCharsets.UTF_8;
-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.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -47,8 +47,8 @@ import org.apache.cxf.jaxrs.JAXRSBindingFactory;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.transport.common.gzip.GZIPInInterceptor;
import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.parser.digestutils.CommonsDigester;
@@ -62,12 +62,12 @@ public abstract class CXFTestBase {
protected TikaConfig tika;
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 assertNotFound(String needle, String haystack) {
- assertFalse(needle + " unexpectedly found in:\n"
- + haystack, haystack.contains(needle));
+ assertFalse(haystack.contains(needle),
+ needle + " unexpectedly found in:\n" + haystack);
}
protected static InputStream copy(InputStream in, int remaining) throws IOException {
@@ -97,7 +97,7 @@ public abstract class CXFTestBase {
return new ByteArrayInputStream(bos.toByteArray());
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.tika = new TikaConfig(getTikaConfigInputStream());
@@ -155,7 +155,7 @@ public abstract class CXFTestBase {
*/
protected abstract void setUpProviders(JAXRSServerFactoryBean sf);
- @After
+ @AfterEach
public void tearDown() throws Exception {
server.stop();
server.destroy();
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java
index f6c8d74..6d36b64 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java
@@ -31,10 +31,10 @@ import javax.ws.rs.core.Response;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,7 +62,7 @@ public class IntegrationTestBase extends TikaTest {
static Path STREAMS_DIR;
private SecurityManager existingSecurityManager = null;
- @BeforeClass
+ @BeforeAll
public static void staticSetup() throws Exception {
LogUtils.setLoggerClass(NullWebClientLogger.class);
LOG_FILE = Files.createTempFile("tika-server-integration", ".xml");
@@ -72,13 +72,13 @@ public class IntegrationTestBase extends TikaTest {
STREAMS_DIR = Files.createTempDirectory("tika-server-integration");
}
- @AfterClass
+ @AfterAll
public static void staticTearDown() throws Exception {
Files.delete(LOG_FILE);
FileUtils.deleteDirectory(STREAMS_DIR.toFile());
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
existingSecurityManager = System.getSecurityManager();
/* System.setSecurityManager(new SecurityManager() {
@@ -98,7 +98,7 @@ public class IntegrationTestBase extends TikaTest {
});*/
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
System.setSecurityManager(existingSecurityManager);
}
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java
index a6f1721..3da7f50 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.resource.LanguageResource;
import org.apache.tika.server.core.writer.TarWriter;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java
index 95a9ca6..733aaa2 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.server.core;
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.InputStream;
import java.io.InputStreamReader;
@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-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-server/tika-server-core/src/test/java/org/apache/tika/server/core/ServerStatusTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/ServerStatusTest.java
index 57b4e6a..6d8fb56 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/ServerStatusTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/ServerStatusTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.tika.server.core;
-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.util.Map;
import java.util.Random;
@@ -27,17 +28,21 @@ 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.junit.jupiter.api.Timeout;
public class ServerStatusTest {
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testBadId() throws Exception {
ServerStatus status = new ServerStatus("", 0);
- status.complete(2);
+ assertThrows(IllegalArgumentException.class, () -> {
+ status.complete(2);
+ });
}
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void testBasicMultiThreading() throws Exception {
//make sure that synchronization is basically working
int numThreads = 10;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
index 73d7510..57b99c2 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.server.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
@@ -29,8 +29,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.resource.DetectorResource;
import org.apache.tika.server.core.resource.MetadataResource;
@@ -95,10 +94,10 @@ public class StackTraceOffTest extends CXFTestBase {
.header("Content-Disposition",
"attachment; filename=" + TEST_PASSWORD_PROTECTED)
.put(ClassLoader.getSystemResourceAsStream(TEST_PASSWORD_PROTECTED));
- assertNotNull("null response: " + path, response);
- assertEquals("unprocessable: " + path, UNPROCESSEABLE, response.getStatus());
+ assertNotNull(response, "null response: " + path);
+ assertEquals(UNPROCESSEABLE, response.getStatus(), "unprocessable: " + path);
String msg = getStringFromInputStream((InputStream) response.getEntity());
- assertEquals("should be empty: " + path, "", msg);
+ assertEquals("", msg, "should be empty: " + path);
}
}
@@ -114,10 +113,11 @@ public class StackTraceOffTest extends CXFTestBase {
}
Response response = WebClient.create(endPoint + path).accept(accept)
.put(ClassLoader.getSystemResourceAsStream(TEST_NULL));
- assertNotNull("null response: " + path, response);
- assertEquals("unprocessable: " + path, UNPROCESSEABLE, response.getStatus());
+ assertNotNull(response, "null response: " + path);
+ assertEquals(UNPROCESSEABLE, response.getStatus(), "unprocessable: " + path);
String msg = getStringFromInputStream((InputStream) response.getEntity());
- assertEquals("should be empty: " + path, "", msg);
+ assertEquals("", msg, "should be empty: " + path);
+
}
}
@@ -132,10 +132,10 @@ public class StackTraceOffTest extends CXFTestBase {
.put(getClass().getResourceAsStream("/test-documents/testDigilite.fdf"));
if (path.equals("/unpack")) {
//"NO CONTENT"
- assertEquals("bad type: " + path, 204, response.getStatus());
+ assertEquals(204, response.getStatus(), "bad type: " + path);
} else {
- assertEquals("bad type: " + path, 200, response.getStatus());
- assertNotNull("null response: " + path, response);
+ assertEquals(200, response.getStatus(), "bad type: " + path);
+ assertNotNull(response, "null response: " + path);
}
}
}
@@ -151,7 +151,7 @@ public class StackTraceOffTest extends CXFTestBase {
Response response =
WebClient.create(endPoint + "/meta" + "/Author").type("application/mock+xml")
.accept(MediaType.TEXT_PLAIN).put(copy(stream, 100));
- Assert.assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+ assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
String msg = getStringFromInputStream((InputStream) response.getEntity());
assertEquals("Failed to get metadata field Author", msg);
}
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
index aeae75a..8811f48 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
@@ -30,8 +30,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.resource.DetectorResource;
import org.apache.tika.server.core.resource.MetadataResource;
@@ -91,8 +90,8 @@ public class StackTraceTest extends CXFTestBase {
.header("Content-Disposition",
"attachment; filename=" + TEST_PASSWORD_PROTECTED)
.put(ClassLoader.getSystemResourceAsStream(TEST_PASSWORD_PROTECTED));
- assertNotNull("null response: " + path, response);
- assertEquals("unprocessable: " + path, UNPROCESSEABLE, response.getStatus());
+ assertNotNull(response, "null response: " + path);
+ assertEquals(UNPROCESSEABLE, response.getStatus(), "unprocessable: " + path);
String msg = getStringFromInputStream((InputStream) response.getEntity());
assertContains("org.apache.tika.exception.EncryptedDocumentException", msg);
}
@@ -110,8 +109,8 @@ public class StackTraceTest extends CXFTestBase {
}
Response response = WebClient.create(endPoint + path).accept(accept)
.put(ClassLoader.getSystemResourceAsStream(TEST_NULL));
- assertNotNull("null response: " + path, response);
- assertEquals("unprocessable: " + path, UNPROCESSEABLE, response.getStatus());
+ assertNotNull(response);
+ assertEquals(UNPROCESSEABLE, response.getStatus(), "unprocessable: " + path);
String msg = getStringFromInputStream((InputStream) response.getEntity());
assertContains("Caused by: java.lang.NullPointerException: null pointer message", msg);
}
@@ -128,10 +127,10 @@ public class StackTraceTest extends CXFTestBase {
.put(ClassLoader.getSystemResourceAsStream("test-documents/testDigilite.fdf"));
if (path.equals("/unpack")) {
//"NO CONTENT"
- assertEquals("bad type: " + path, 204, response.getStatus());
+ assertEquals(204, response.getStatus(), "bad type: " + path);
} else {
- assertEquals("bad type: " + path, 200, response.getStatus());
- assertNotNull("null response: " + path, response);
+ assertEquals(200, response.getStatus(), "bad type: " + path);
+ assertNotNull(response, "null response: " + path);
}
}
}
@@ -148,7 +147,7 @@ public class StackTraceTest extends CXFTestBase {
Response response =
WebClient.create(endPoint + "/meta" + "/Author").type("application/mock+xml")
.accept(MediaType.TEXT_PLAIN).put(copy(stream, 100));
- Assert.assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+ assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
String msg = getStringFromInputStream((InputStream) response.getEntity());
assertEquals("Failed to get metadata field Author", msg);
}
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java
index 409845a..51f387d 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java
@@ -23,7 +23,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.resource.TikaMimeTypes;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java
index b63e29d..a6ce922 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.tika.server.core;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -42,10 +42,10 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.AfterClass;
-import org.junit.Before;
-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.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.exception.TikaConfigException;
@@ -83,7 +83,7 @@ public class TikaPipesTest extends CXFTestBase {
private static String[] VALUE_ARRAY = new String[]{"my-value-1", "my-value-2", "my-value-3"};
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TMP_DIR = Files.createTempDirectory("tika-pipes-test-");
Path inputDir = TMP_DIR.resolve("input");
@@ -120,12 +120,12 @@ public class TikaPipesTest extends CXFTestBase {
Files.write(TIKA_CONFIG_PATH, TIKA_CONFIG_XML.getBytes(StandardCharsets.UTF_8));
}
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() throws Exception {
FileUtils.deleteDirectory(TMP_DIR.toFile());
}
- @Before
+ @BeforeEach
public void setUpEachTest() throws Exception {
if (Files.exists(TMP_OUTPUT_FILE)) {
Files.delete(TMP_OUTPUT_FILE);
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java
index 8d6c44a..816cc0a 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-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-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java
index f109bb1..d0f4c62 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.server.core;
import static org.apache.tika.TikaTest.assertNotContained;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-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-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java
index 16ef062..eb5222b 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.core;
-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.io.InputStreamReader;
@@ -33,7 +33,7 @@ import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-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-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
index 841d8b3..90523cd 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
@@ -18,8 +18,8 @@ package org.apache.tika.server.core;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.io.InputStream;
@@ -36,11 +36,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +52,7 @@ import org.apache.tika.pipes.emitter.EmitKey;
import org.apache.tika.pipes.fetcher.FetchKey;
import org.apache.tika.utils.ProcessUtils;
-@Ignore("useful for development...need to turn it into a real unit test")
+@Disabled("useful for development...need to turn it into a real unit test")
public class TikaServerAsyncIntegrationTest extends IntegrationTestBase {
private static final Logger LOG = LoggerFactory.getLogger(TikaServerAsyncIntegrationTest.class);
@@ -73,7 +73,7 @@ public class TikaServerAsyncIntegrationTest extends IntegrationTestBase {
"system_exit.xml"
};
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TMP_DIR = Files.createTempDirectory("tika-emitter-test-");
Path inputDir = TMP_DIR.resolve("input");
@@ -125,12 +125,12 @@ public class TikaServerAsyncIntegrationTest extends IntegrationTestBase {
FileUtils.write(TIKA_CONFIG.toFile(), TIKA_CONFIG_XML, UTF_8);
}
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() throws Exception {
FileUtils.deleteDirectory(TMP_DIR.toFile());
}
- @Before
+ @BeforeEach
public void setUpEachTest() throws Exception {
for (String problemFile : FILES) {
Path targ = TMP_OUTPUT_DIR.resolve(problemFile + ".json");
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerConfigTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerConfigTest.java
index b7e8f29..a9716ad 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerConfigTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerConfigTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.server.core;
-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.nio.file.Path;
import java.nio.file.Paths;
@@ -28,7 +28,7 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfigTest;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
index 9fc6a4b..4232af2 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.core;
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.InputStream;
import java.io.InputStreamReader;
@@ -35,9 +35,10 @@ import javax.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +50,7 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
private static final Logger LOG = LoggerFactory.getLogger(TikaServerIntegrationTest.class);
- @After
+ @AfterEach
public void tearDown() throws Exception {
//wait just a bit for the servers to shutdown
Thread.sleep(500);
@@ -220,7 +221,8 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
}
}
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void testTimeout() throws Exception {
Process p = null;
@@ -301,7 +303,7 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
}
@Test
- @Ignore("This works, but prints too much junk to the console. " +
+ @Disabled("This works, but prints too much junk to the console. " +
"Figure out how to gobble/redirect.")
public void testStaticStdErrOutBasic() throws Exception {
Process p = null;
@@ -326,7 +328,7 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
}
- @Ignore("TODO needs to write dynamic config file w logfile location")
+ @Disabled("TODO needs to write dynamic config file w logfile location")
@Test
public void testStdErrOutLogging() throws Exception {
final AtomicInteger i = new AtomicInteger();
@@ -357,7 +359,7 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
@Test
- @Ignore("turn this into a real test")
+ @Disabled("turn this into a real test")
public void testMaxFiles() throws Exception {
//this isn't a real regression test yet.
//Can watch logs at least for confirmation of behavior
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java
index 71c9468..38cef19 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java
@@ -18,10 +18,10 @@ package org.apache.tika.server.core;
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.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.io.InputStream;
@@ -36,11 +36,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +66,7 @@ public class TikaServerPipesIntegrationTest extends IntegrationTestBase {
new String[]{"hello_world.xml", "heavy_hang_30000.xml", "fake_oom.xml",
"system_exit.xml", "null_pointer.xml"};
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TMP_DIR = Files.createTempDirectory("tika-emitter-test-");
Path inputDir = TMP_DIR.resolve("input");
@@ -112,17 +112,17 @@ public class TikaServerPipesIntegrationTest extends IntegrationTestBase {
}
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() throws Exception {
FileUtils.deleteDirectory(TMP_DIR.toFile());
}
- @After
+ @AfterEach
public void tear() throws Exception {
Thread.sleep(500);
}
- @Before
+ @BeforeEach
public void setUpEachTest() throws Exception {
for (String problemFile : FILES) {
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java
index fb15830..d5044bc 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.tika.server.core;
-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;
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.resource.TikaServerStatus;
import org.apache.tika.server.core.writer.JSONObjWriter;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
index 5b62ebd..e4e623f 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
@@ -17,7 +17,7 @@
package org.apache.tika.server.core;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
import javax.ws.rs.core.Response;
@@ -25,7 +25,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.server.core.resource.TikaVersion;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
index f19f0e0..5900801 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
@@ -26,7 +26,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.Tika;
import org.apache.tika.server.core.resource.DetectorResource;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java
index f9f2e38..4b77fdd 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.resource.TranslateResource;
import org.apache.tika.server.core.writer.TarWriter;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java
index 7f32a4f..1ca85a5 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.standard;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.CXFTestBase;
import org.apache.tika.server.core.ServerStatus;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java
index 7d3a95c..b22a7c9 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.server.standard;
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.InputStream;
import java.io.InputStreamReader;
@@ -33,8 +33,8 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.metadata.Metadata;
@@ -48,7 +48,7 @@ import org.apache.tika.server.core.resource.RecursiveMetadataResource;
import org.apache.tika.server.core.writer.MetadataListMessageBodyWriter;
-@Ignore("turn into actual unit tests -- this relies on network connectivity...bad")
+@Disabled("turn into actual unit tests -- this relies on network connectivity...bad")
public class FetcherTest extends CXFTestBase {
private static final String META_PATH = "/rmeta";
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
index 17c38df..0d25ba3 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
@@ -18,8 +18,8 @@
package org.apache.tika.server.standard;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -38,9 +38,7 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -54,6 +52,7 @@ import org.apache.tika.server.standard.resource.XMPMetadataResource;
import org.apache.tika.server.standard.writer.XMPMessageBodyWriter;
public class MetadataResourceTest extends CXFTestBase {
+
private static final String META_PATH = "/meta";
@Override
@@ -94,8 +93,7 @@ public class MetadataResourceTest extends CXFTestBase {
assertNotNull(metadata.get(TikaCoreProperties.CREATOR.getName()));
assertEquals("Maxim Valyanskiy", metadata.get(TikaCoreProperties.CREATOR.getName()));
- assertEquals("X-TIKA:digest:MD5", "f8be45c34e8919eedba48cc8d207fbf0",
- metadata.get("X-TIKA:digest:MD5"));
+ assertEquals("f8be45c34e8919eedba48cc8d207fbf0", metadata.get("X-TIKA:digest:MD5"), "X-TIKA:digest:MD5");
}
@Test
@@ -167,7 +165,7 @@ public class MetadataResourceTest extends CXFTestBase {
WebClient.create(endPoint + META_PATH + "/xxx").type("application/msword")
.accept(MediaType.APPLICATION_JSON)
.put(ClassLoader.getSystemResourceAsStream(TikaResourceTest.TEST_DOC));
- Assert.assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+ assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
}
@Test
@@ -178,11 +176,10 @@ public class MetadataResourceTest extends CXFTestBase {
Response response =
WebClient.create(endPoint + META_PATH + "/Author").type("application/msword")
.accept(MediaType.TEXT_PLAIN).put(copy(stream, 8000));
- Assert.assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+ assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
}
@Test
- @Ignore("TODO: add back in xmp handler")
public void testGetField_Author_TEXT_Partial_Found() throws Exception {
InputStream stream = ClassLoader.getSystemResourceAsStream(TikaResourceTest.TEST_DOC);
@@ -191,7 +188,7 @@ public class MetadataResourceTest extends CXFTestBase {
WebClient.create(endPoint + META_PATH + "/" + TikaCoreProperties.CREATOR.getName())
.type("application/msword").accept(MediaType.TEXT_PLAIN)
.put(copy(stream, 12000));
- Assert.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+ assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
String s = IOUtils.readStringFromStream((InputStream) response.getEntity());
assertEquals("Maxim Valyanskiy", s);
}
@@ -205,7 +202,7 @@ public class MetadataResourceTest extends CXFTestBase {
WebClient.create(endPoint + META_PATH + "/" + TikaCoreProperties.CREATOR.getName())
.type("application/msword").accept(MediaType.APPLICATION_JSON)
.put(copy(stream, 12000));
- Assert.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+ assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
Metadata metadata = JsonMetadata
.fromJson(new InputStreamReader((InputStream) response.getEntity(), UTF_8));
assertEquals("Maxim Valyanskiy", metadata.get(TikaCoreProperties.CREATOR));
@@ -213,7 +210,6 @@ public class MetadataResourceTest extends CXFTestBase {
}
@Test
- @Ignore("TODO: until we can reintegrate xmpwriter")
public void testGetField_Author_XMP_Partial_Found() throws Exception {
InputStream stream = ClassLoader.getSystemResourceAsStream(TikaResourceTest.TEST_DOC);
@@ -221,7 +217,7 @@ public class MetadataResourceTest extends CXFTestBase {
Response response =
WebClient.create(endPoint + META_PATH + "/dc:creator").type("application/msword")
.accept("application/rdf+xml").put(copy(stream, 12000));
- Assert.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+ assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
String s = IOUtils.readStringFromStream((InputStream) response.getEntity());
assertContains("<rdf:li>Maxim Valyanskiy</rdf:li>", s);
}
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java
index da23723..d365cd7 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java
@@ -18,9 +18,9 @@
package org.apache.tika.server.standard;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -35,7 +35,7 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.serialization.JsonMetadataList;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java
index d052349..1663fb7 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java
@@ -18,10 +18,10 @@
package org.apache.tika.server.standard;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -37,7 +37,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-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-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java
index 76bb110..2d21e4d 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.standard;
-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.List;
@@ -30,7 +30,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.gagravarr.tika.OggDetector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.detect.microsoft.POIFSContainerDetector;
import org.apache.tika.detect.zip.DefaultZipContainerDetector;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java
index c0fb9bf..e5a0544 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.standard;
-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.List;
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.server.core.CXFTestBase;
import org.apache.tika.server.core.resource.TikaMimeTypes;
@@ -75,9 +75,9 @@ public class TikaMimeTypesTest extends CXFTestBase {
assertEquals("image/x-ms-bmp", aliases.get(1));
String whichParser = bmp.get("parser").toString();
- assertTrue("Which parser",
- whichParser.equals("org.apache.tika.parser.ocr.TesseractOCRParser") ||
- whichParser.equals("org.apache.tika.parser.image.ImageParser"));
+ assertTrue(whichParser.equals("org.apache.tika.parser.ocr.TesseractOCRParser") ||
+ whichParser.equals("org.apache.tika.parser.image.ImageParser"),
+ "Which parser");
Map<String, Object> ogm = json.get("video/x-ogm");
assertEquals("video/ogg", ogm.get("supertype"));
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java
index e6aed72..bb83ced 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.server.standard;
-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.List;
@@ -30,7 +30,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.gagravarr.tika.OpusParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.parser.microsoft.ooxml.OOXMLParser;
import org.apache.tika.parser.pkg.PackageParser;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java
index 8c392bb..4c29b31 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java
@@ -19,9 +19,9 @@ package org.apache.tika.server.standard;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.cxf.helpers.HttpHeaderHelper.CONTENT_ENCODING;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -43,7 +43,7 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.OfficeOpenXMLExtended;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java
index c2efcad..2ace75d 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java
@@ -17,10 +17,11 @@
package org.apache.tika.server.standard;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
import java.util.ArrayList;
@@ -32,8 +33,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.parser.ocr.TesseractOCRParser;
import org.apache.tika.server.core.CXFTestBase;
@@ -223,7 +223,7 @@ public class UnpackerResourceTest extends CXFTestBase {
@Test
public void testPDFRenderOCR() throws Exception {
- Assume.assumeTrue(new TesseractOCRParser().hasTesseract());
+ assumeTrue(new TesseractOCRParser().hasTesseract());
Response response = WebClient.create(CXFTestBase.endPoint + ALL_PATH)
.header(PDFServerConfig.X_TIKA_PDF_HEADER_PREFIX + "ocrStrategy", "ocr_only")
[tika] 01/02: TIKA-3499 -- tika-serialization
Posted by ta...@apache.org.
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 f462576f1a2a58b1e0612a987584efa1f06e1cb3
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 28 11:11:23 2021 -0400
TIKA-3499 -- tika-serialization
---
tika-serialization/pom.xml | 8 --------
.../tika/metadata/serialization/JsonFetchEmitTupleListTest.java | 4 ++--
.../tika/metadata/serialization/JsonFetchEmitTupleTest.java | 4 ++--
.../apache/tika/metadata/serialization/JsonMetadataListTest.java | 8 ++++----
.../org/apache/tika/metadata/serialization/JsonMetadataTest.java | 8 ++++----
5 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/tika-serialization/pom.xml b/tika-serialization/pom.xml
index f530be6..a00e5c8 100644
--- a/tika-serialization/pom.xml
+++ b/tika-serialization/pom.xml
@@ -61,14 +61,6 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
-
- <!-- after we migrate everything to junit5, we can get rid of this -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleListTest.java b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleListTest.java
index 33909a7..cf57e52 100644
--- a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleListTest.java
+++ b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleListTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.metadata.serialization;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.Reader;
import java.io.StringReader;
@@ -24,7 +24,7 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.pipes.FetchEmitTuple;
diff --git a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleTest.java b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleTest.java
index 56ad551..4e827cc 100644
--- a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleTest.java
+++ b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonFetchEmitTupleTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.tika.metadata.serialization;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.pipes.FetchEmitTuple;
diff --git a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
index cb71859..930a594 100644
--- a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
+++ b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.metadata.serialization;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.Reader;
import java.io.StringReader;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-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-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
index 9a352da..6c2f27b 100644
--- a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
+++ b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.tika.metadata.serialization;
-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.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;