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 2022/05/13 11:54:40 UTC
[tika] 01/10: TIKA-3760 -- migrate to junit5 in tika-eval
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 d86eb703b9b35522aeabc9b33a765ef6bdde831a
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 04:24:27 2022 -0400
TIKA-3760 -- migrate to junit5 in tika-eval
---
tika-eval/pom.xml | 9 --------
tika-eval/tika-eval-app/pom.xml | 6 ++++++
.../apache/tika/eval/app/AnalyzerManagerTest.java | 10 ++++-----
.../apache/tika/eval/app/ComparerBatchTest.java | 18 ++++++++--------
.../apache/tika/eval/app/ProfilerBatchTest.java | 24 +++++++++++-----------
.../apache/tika/eval/app/SimpleComparerTest.java | 24 +++++++++++-----------
.../org/apache/tika/eval/app/TikaEvalCLITest.java | 16 +++++++--------
.../tika/eval/app/db/AbstractBufferTest.java | 9 +++++---
.../apache/tika/eval/app/io/ExtractReaderTest.java | 8 ++++----
.../tika/eval/app/io/FatalExceptionReaderTest.java | 2 +-
.../tika/eval/app/reports/ResultsReporterTest.java | 10 ++++-----
.../eval/app/tools/TopCommonTokenCounterTest.java | 12 +++++------
.../apache/tika/eval/core/langid/LangIdTest.java | 8 ++++----
.../core/metadata/TikaEvalMetadataFilterTest.java | 4 ++--
.../tika/eval/core/textstats/TextStatsTest.java | 4 ++--
.../tika/eval/core/tokens/TokenCounterTest.java | 11 +++++-----
.../apache/tika/eval/core/util/LanguageIdTest.java | 11 ++++++----
.../apache/tika/eval/core/util/MimeUtilTest.java | 12 +++++------
18 files changed, 101 insertions(+), 97 deletions(-)
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index 031a35b69..a37ab90a2 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -38,15 +38,6 @@
<module>tika-eval-app</module>
</modules>
- <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-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml
index 39132af5b..fd455b459 100644
--- a/tika-eval/tika-eval-app/pom.xml
+++ b/tika-eval/tika-eval-app/pom.xml
@@ -74,6 +74,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>RELEASE</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/AnalyzerManagerTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/AnalyzerManagerTest.java
index d26295965..c4202b56d 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/AnalyzerManagerTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/AnalyzerManagerTest.java
@@ -17,10 +17,10 @@
package org.apache.tika.eval.app;
-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.util.HashSet;
import java.util.Set;
@@ -28,7 +28,7 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.eval.core.tokens.AlphaIdeographFilterFactory;
import org.apache.tika.eval.core.tokens.AnalyzerManager;
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ComparerBatchTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ComparerBatchTest.java
index 5253a6aa6..43827d294 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ComparerBatchTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ComparerBatchTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.eval.app;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.nio.file.FileSystems;
@@ -36,15 +36,15 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.batch.fs.FSBatchTestBase;
import org.apache.tika.eval.app.db.Cols;
-@Ignore("move these tests to TikaEvalCLITest")
+@Disabled("move these tests to TikaEvalCLITest")
public class ComparerBatchTest extends FSBatchTestBase {
public final static String COMPARER_PROCESS_CLASS =
@@ -57,7 +57,7 @@ public class ComparerBatchTest extends FSBatchTestBase {
"on cmp."+AbstractProfiler.CONTAINER_HEADERS.CONTAINER_ID+
" = cnt."+AbstractProfiler.CONTAINER_HEADERS.CONTAINER_ID;*/
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
File inputRoot = new File(ComparerBatchTest.class.getResource("/test-dirs").toURI());
@@ -78,7 +78,7 @@ public class ComparerBatchTest extends FSBatchTestBase {
conn = dbUtil.getConnection();*/
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
conn.close();
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ProfilerBatchTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ProfilerBatchTest.java
index a39ff018d..a297b2197 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ProfilerBatchTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/ProfilerBatchTest.java
@@ -17,8 +17,8 @@
package org.apache.tika.eval.app;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
import java.io.IOException;
import java.nio.file.DirectoryStream;
@@ -34,17 +34,17 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.eval.app.db.Cols;
import org.apache.tika.eval.app.db.H2Util;
import org.apache.tika.eval.app.db.TableInfo;
import org.apache.tika.eval.app.io.ExtractReaderException;
-@Ignore
+@Disabled
public class ProfilerBatchTest {
public final static String COMPARER_PROCESS_CLASS =
@@ -55,7 +55,7 @@ public class ProfilerBatchTest {
private static Path dbDir;
private static Connection conn;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
Path inputRoot = Paths.get(
@@ -77,7 +77,7 @@ public class ProfilerBatchTest {
conn = dbUtil.getConnection();
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws IOException {
try {
@@ -180,12 +180,12 @@ public class ProfilerBatchTest {
int hits = 0;
String val = "";
while (rs.next()) {
- assertEquals("must have only one column in result", 1,
- rs.getMetaData().getColumnCount());
+ assertEquals(1,
+ rs.getMetaData().getColumnCount(), "must have only one column in result");
val = rs.getString(1);
hits++;
}
- assertEquals("must have only one hit", 1, hits);
+ assertEquals(1, hits, "must have only one hit");
return val;
}
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/SimpleComparerTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/SimpleComparerTest.java
index 7277030d6..be9c71cdb 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/SimpleComparerTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/SimpleComparerTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.eval.app;
import static org.apache.tika.eval.app.io.ExtractReader.IGNORE_LENGTH;
-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.nio.file.Path;
import java.nio.file.Paths;
@@ -30,10 +30,10 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+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.apache.tika.TikaTest;
import org.apache.tika.eval.app.db.Cols;
@@ -53,14 +53,14 @@ public class SimpleComparerTest extends TikaTest {
private static MockDBWriter WRITER;
private ExtractComparer comparer = null;
- @BeforeClass
+ @BeforeAll
public static void staticSetUp() throws Exception {
WRITER = new MockDBWriter();
AbstractProfiler.loadCommonTokens(
Paths.get(SimpleComparerTest.class.getResource("/common_tokens").toURI()), "en");
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
WRITER.clear();
comparer = new ExtractComparer(null, null, Paths.get("extractsA"), Paths.get("extractsB"),
@@ -257,7 +257,7 @@ public class SimpleComparerTest extends TikaTest {
List<Map<Cols, String>> tableInfos = WRITER.getTable(ExtractComparer.CONTENT_COMPARISONS);
assertEquals(3, tableInfos.size());
for (int i = 0; i < tableInfos.size(); i++) {
- assertEquals("problem with " + i, "1.0", tableInfos.get(i).get(Cols.OVERLAP));
+ assertEquals("1.0", tableInfos.get(i).get(Cols.OVERLAP), "problem with " + i);
}
}
@@ -326,7 +326,7 @@ public class SimpleComparerTest extends TikaTest {
}
@Test
- @Ignore
+ @Disabled
public void testDebug() throws Exception {
Path commonTokens = Paths.get(getResourceAsFile("/common_tokens_short.txt").toURI());
AbstractProfiler.loadCommonTokens(commonTokens, "en");
@@ -370,7 +370,7 @@ public class SimpleComparerTest extends TikaTest {
}
@Test
- @Ignore("useful for testing 2 files not in test set")
+ @Disabled("useful for testing 2 files not in test set")
public void oneOff() throws Exception {
Path p1 = Paths.get("");
Path p2 = Paths.get("");
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/TikaEvalCLITest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/TikaEvalCLITest.java
index c9237a297..ef4369dc6 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/TikaEvalCLITest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/TikaEvalCLITest.java
@@ -17,7 +17,7 @@
package org.apache.tika.eval.app;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -33,10 +33,10 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.utils.ProcessUtils;
@@ -51,7 +51,7 @@ public class TikaEvalCLITest extends TikaTest {
private static Path compareReportsDir;
private static Path profileReportsDir;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
compareDBDir = Files.createTempDirectory("tika-eval-cli-compare-db-");
profileDBDir = Files.createTempDirectory("tika-eval-cli-profile-db-");
@@ -63,7 +63,7 @@ public class TikaEvalCLITest extends TikaTest {
reportProfile();
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
FileUtils.deleteDirectory(compareDBDir.toFile());
FileUtils.deleteDirectory(profileDBDir.toFile());
@@ -217,7 +217,7 @@ public class TikaEvalCLITest extends TikaTest {
}
@Test
- @Ignore("use this for development")
+ @Disabled("use this for development")
public void testOneOff() throws Exception {
List<String> args = new ArrayList<>();
args.add("Compare");
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java
index c822073af..cf4c7aad3 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.eval.app.db;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -36,12 +36,15 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
public class AbstractBufferTest {
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void runTest() throws InterruptedException, ExecutionException {
List<String> keys = new ArrayList<>();
Collections
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/ExtractReaderTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/ExtractReaderTest.java
index 911610a55..d3e9a01df 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/ExtractReaderTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/ExtractReaderTest.java
@@ -17,14 +17,14 @@
package org.apache.tika.eval.app.io;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
@@ -35,7 +35,7 @@ public class ExtractReaderTest extends TikaTest {
private Path testJsonFile;
private Path testTxtFile;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
testJsonFile =
getResourceAsFile("/test-dirs/extractsA/file2_attachANotB.doc.json").toPath();
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/FatalExceptionReaderTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/FatalExceptionReaderTest.java
index af378c2fe..aba84d436 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/FatalExceptionReaderTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/io/FatalExceptionReaderTest.java
@@ -20,7 +20,7 @@ package org.apache.tika.eval.app.io;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FatalExceptionReaderTest {
@Test
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/reports/ResultsReporterTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/reports/ResultsReporterTest.java
index a56e9533c..e7d80ba73 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/reports/ResultsReporterTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/reports/ResultsReporterTest.java
@@ -23,9 +23,9 @@ import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.Statement;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.eval.app.db.H2Util;
@@ -35,7 +35,7 @@ public class ResultsReporterTest {
private String dbName = "test-db";
private Connection connection;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
configFile = Paths.get(this.getClass().getResource("/reports.xml").toURI());
tmpDir = Files.createTempDirectory("tika-eval-report-test-");
@@ -52,7 +52,7 @@ public class ResultsReporterTest {
}
@Test
- @Ignore("add a real test here")
+ @Disabled("add a real test here")
public void testBuilder() throws Exception {
ResultsReporter r = ResultsReporter.build(configFile);
r.execute(connection, Paths.get("reports"));
diff --git a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/tools/TopCommonTokenCounterTest.java b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/tools/TopCommonTokenCounterTest.java
index 91010b6a7..e38faf590 100644
--- a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/tools/TopCommonTokenCounterTest.java
+++ b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/tools/TopCommonTokenCounterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.eval.app.tools;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.BufferedWriter;
import java.nio.charset.StandardCharsets;
@@ -26,9 +26,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.utils.ProcessUtils;
@@ -39,7 +39,7 @@ public class TopCommonTokenCounterTest extends TikaTest {
private static Path WORKING_DIR;
// private static Path LUCENE_DIR;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
String[] docs =
new String[]{"th quick brown fox", "jumped over th brown lazy", "brown lazy fox",
@@ -64,7 +64,7 @@ public class TopCommonTokenCounterTest extends TikaTest {
WORKING_DIR.resolve(INPUT_FILE).toAbsolutePath().toString())});
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
FileUtils.deleteDirectory(WORKING_DIR.toFile());
}
diff --git a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/langid/LangIdTest.java b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/langid/LangIdTest.java
index bff574cc8..d2b84ea37 100644
--- a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/langid/LangIdTest.java
+++ b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/langid/LangIdTest.java
@@ -17,7 +17,7 @@
package org.apache.tika.eval.core.langid;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.nio.file.Path;
@@ -27,8 +27,8 @@ import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.eval.core.tokens.CommonTokenCountManager;
@@ -36,7 +36,7 @@ public class LangIdTest {
@Test
- @Ignore("make sure to run this when updating common tokens or the language model" +
+ @Disabled("make sure to run this when updating common tokens or the language model" +
"but there's no reason to test this for every build.")
public void testCommonTokensCoverage() throws Exception {
//make sure that there is a common tokens file for every
diff --git a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/metadata/TikaEvalMetadataFilterTest.java b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/metadata/TikaEvalMetadataFilterTest.java
index f1926d689..1961698b4 100644
--- a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/metadata/TikaEvalMetadataFilterTest.java
+++ b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/metadata/TikaEvalMetadataFilterTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.eval.core.metadata;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
diff --git a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/textstats/TextStatsTest.java b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/textstats/TextStatsTest.java
index 2271119f2..2ca6138dd 100644
--- a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/textstats/TextStatsTest.java
+++ b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/textstats/TextStatsTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.eval.core.textstats;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.commons.codec.binary.Base32;
import org.apache.commons.codec.digest.DigestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.eval.core.langid.LanguageIDWrapper;
import org.apache.tika.eval.core.tokens.CommonTokenResult;
diff --git a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/tokens/TokenCounterTest.java b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/tokens/TokenCounterTest.java
index 75f089dbb..e96557150 100644
--- a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/tokens/TokenCounterTest.java
+++ b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/tokens/TokenCounterTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.eval.core.tokens;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.HashMap;
@@ -29,8 +29,8 @@ import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class TokenCounterTest {
private final static String FIELD = "f";
@@ -38,7 +38,7 @@ public class TokenCounterTest {
private final int topN = 10;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws IOException {
analyzerManager = AnalyzerManager.newInstance(100000);
@@ -76,7 +76,8 @@ public class TokenCounterTest {
new LuceneTokenCounter(analyzerManager.getGeneralAnalyzer());
tokenCounter.add(FIELD, s);
lucene += System.currentTimeMillis() - start;
- assertEquals(s, simpleTokenStatistics, tokenCounter.getTokenStatistics(FIELD));
+
+ assertEquals(simpleTokenStatistics, tokenCounter.getTokenStatistics(FIELD), s);
}
}
diff --git a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/LanguageIdTest.java b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/LanguageIdTest.java
index 95bf3b512..8ae73d1de 100644
--- a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/LanguageIdTest.java
+++ b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/LanguageIdTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.tika.eval.core.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.apache.tika.eval.core.langid.LanguageIDWrapper;
import org.apache.tika.language.detect.LanguageResult;
public class LanguageIdTest {
- @Test(timeout = 10000)
+ @Test
+ @Timeout(10000)
public void testDefenseAgainstBadRegexInOpenNLP() throws Exception {
//TIKA-2777
StringBuilder sb = new StringBuilder();
@@ -34,6 +37,6 @@ public class LanguageIdTest {
}
LanguageIDWrapper wrapper = new LanguageIDWrapper();
List<LanguageResult> languages = wrapper.calculate(sb.toString());
- Assert.assertEquals("mri", languages.get(0).getLanguage());
+ assertEquals("mri", languages.get(0).getLanguage());
}
}
diff --git a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/MimeUtilTest.java b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/MimeUtilTest.java
index 13bc37a65..63793ba06 100644
--- a/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/MimeUtilTest.java
+++ b/tika-eval/tika-eval-core/src/test/java/org/apache/tika/eval/core/util/MimeUtilTest.java
@@ -18,18 +18,18 @@
package org.apache.tika.eval.core.util;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-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.mime.MimeType;
import org.apache.tika.mime.MimeTypeException;
import org.apache.tika.mime.MimeTypes;
-@Ignore("Fix mimetype.getExtension to work with these and then we can get rid of MimeUtil")
+@Disabled("Fix mimetype.getExtension to work with these and then we can get rid of MimeUtil")
public class MimeUtilTest {
private final TikaConfig tikaConfig = TikaConfig.getDefaultConfig();
@@ -52,7 +52,7 @@ public class MimeUtilTest {
} catch (MimeTypeException e) {
ex = true;
}
- assertTrue("Should have had exception for: " + contentType, ex);
+ assertTrue(ex, "Should have had exception for: " + contentType);
}
private void assertResult(String contentType, String expected) throws MimeTypeException {