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:39 UTC
[tika] branch main updated (adf8dacf7 -> f4a2960ed)
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 adf8dacf7 TIKA-3756
new d86eb703b TIKA-3760 -- migrate to junit5 in tika-eval
new de04c1cdd TIKA-3757 - migrate to junit5 in tika-translate
new 27b4273d0 TIKA-3761 - migrate to junit5 in tika-example
new 5bfdf933e migrate to junit5 in tika-java7
new 574e4defc TIKA-3758 -- upgrade to junit5 in tika-app
new 6bd1bd939 TIKA-3762 -- upgrade to junit5 in tika-xmp
new 6c1ec133f TIKA-3759 -- upgrade to junit5 in tika-batch
new 71c9f9f20 upgrade to junit5 in tika-fuzzing
new 84582534c upgrade to junit5 in tika-bundles
new f4a2960ed fix checkstyle
The 10 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-app/pom.xml | 7 ---
.../tika/cli/TikaCLIBatchCommandLineTest.java | 18 +++---
.../tika/cli/TikaCLIBatchIntegrationTest.java | 21 +++----
.../test/java/org/apache/tika/cli/TikaCLITest.java | 36 ++++++------
.../tika/extractor/TestEmbeddedDocumentUtil.java | 6 +-
tika-batch/pom.xml | 7 ---
.../tika/batch/CommandLineParserBuilderTest.java | 2 +-
.../RecursiveParserWrapperFSConsumerTest.java | 4 +-
.../org/apache/tika/batch/fs/BatchDriverTest.java | 61 +++++++++++++--------
.../org/apache/tika/batch/fs/BatchProcessTest.java | 61 +++++++++++++--------
.../org/apache/tika/batch/fs/FSBatchTestBase.java | 8 +--
.../apache/tika/batch/fs/FSFileResourceTest.java | 6 +-
.../java/org/apache/tika/batch/fs/FSUtilTest.java | 22 +++-----
.../apache/tika/batch/fs/HandlerBuilderTest.java | 6 +-
.../tika/batch/fs/OutputStreamFactoryTest.java | 8 +--
.../tika/batch/fs/strawman/StrawmanTest.java | 2 +-
tika-bundles/pom.xml | 9 ---
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 ++--
tika-example/pom.xml | 7 ---
.../tika/example/AdvancedTypeDetectorTest.java | 5 +-
.../tika/example/ContentHandlerExampleTest.java | 15 ++---
.../tika/example/DumpTikaConfigExampleTest.java | 24 ++++----
.../tika/example/ExtractEmbeddedFilesTest.java | 12 ++--
.../tika/example/LanguageDetectorExampleTest.java | 8 +--
.../tika/example/SimpleTextExtractorTest.java | 2 +-
.../tika/example/SimpleTypeDetectorTest.java | 2 +-
.../apache/tika/example/TestParsingExample.java | 37 +++++--------
.../tika/example/TextStatsFromTikaEvalTest.java | 4 +-
.../apache/tika/example/TranslatorExampleTest.java | 8 +--
tika-fuzzing/pom.xml | 7 ---
tika-fuzzing/src/test/java/TestFuzzingCLI.java | 8 +--
tika-fuzzing/src/test/java/TestTransformer.java | 6 +-
tika-java7/pom.xml | 7 ---
.../filetypedetector/TikaFileTypeDetectorTest.java | 26 ++++-----
tika-translate/pom.xml | 58 +++++++++-----------
.../translate/impl/CachedTranslatorTest.java | 39 ++++++-------
.../translate/impl/GoogleTranslatorTest.java | 24 ++++----
.../impl/JoshuaNetworkTranslatorTest.java | 37 ++++++-------
.../translate/impl/Lingo24TranslatorTest.java | 27 ++++-----
.../translate/impl/MarianTranslatorTest.java | 33 +++++------
.../translate/impl/MicrosoftTranslatorTest.java | 23 ++++----
.../translate/impl/MosesTranslatorTest.java | 16 +++---
.../language/translate/impl/RTGTranslatorTest.java | 64 +++++++++++-----------
.../translate/impl/YandexTranslatorTest.java | 52 +++++++++---------
tika-xmp/pom.xml | 7 ---
.../java/org/apache/tika/xmp/TikaToXMPTest.java | 27 +++++----
.../java/org/apache/tika/xmp/XMPMetadataTest.java | 61 +++++++++++++--------
64 files changed, 549 insertions(+), 579 deletions(-)
[tika] 10/10: fix checkstyle
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 f4a2960ed50d80e1958ed0d82a635cb64f8d5f53
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 07:54:20 2022 -0400
fix checkstyle
---
tika-fuzzing/src/test/java/TestFuzzingCLI.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/tika-fuzzing/src/test/java/TestFuzzingCLI.java b/tika-fuzzing/src/test/java/TestFuzzingCLI.java
index 9a6009e2e..9e3e49dc0 100644
--- a/tika-fuzzing/src/test/java/TestFuzzingCLI.java
+++ b/tika-fuzzing/src/test/java/TestFuzzingCLI.java
@@ -23,7 +23,6 @@ import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-
import org.apache.tika.fuzzing.cli.FuzzingCLI;
import org.apache.tika.utils.ProcessUtils;
[tika] 06/10: TIKA-3762 -- upgrade to junit5 in tika-xmp
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 6bd1bd939d728337c00ddaf2466b11aa5dbe5de4
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 05:46:47 2022 -0400
TIKA-3762 -- upgrade to junit5 in tika-xmp
---
tika-xmp/pom.xml | 7 ---
.../java/org/apache/tika/xmp/TikaToXMPTest.java | 27 ++++++----
.../java/org/apache/tika/xmp/XMPMetadataTest.java | 61 ++++++++++++++--------
3 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml
index 35b7355ee..fdd785bc9 100644
--- a/tika-xmp/pom.xml
+++ b/tika-xmp/pom.xml
@@ -99,13 +99,6 @@
<artifactId>xmpcore</artifactId>
<version>${xmpcore.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>
<description>Converts Tika metadata to XMP</description>
diff --git a/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java b/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java
index 5fdb07c54..7f92db295 100644
--- a/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java
+++ b/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.tika.xmp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
@@ -29,8 +30,6 @@ import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.xmp.convert.ITikaToXMPConverter;
import org.apache.tika.xmp.convert.MSOfficeXMLConverter;
import org.apache.tika.xmp.convert.TikaToXMP;
-import org.junit.Before;
-import org.junit.Test;
import com.adobe.internal.xmp.XMPConst;
import com.adobe.internal.xmp.XMPException;
@@ -38,6 +37,8 @@ import com.adobe.internal.xmp.XMPIterator;
import com.adobe.internal.xmp.XMPMeta;
import com.adobe.internal.xmp.XMPMetaFactory;
import com.adobe.internal.xmp.properties.XMPProperty;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the Tika <code>Metadata</code> to XMP conversion functionatlity
@@ -49,7 +50,7 @@ public class TikaToXMPTest {
private static final String GENERIC_MIMETYPE = "generic/mimetype";
// --- Set up ---
- @Before
+ @BeforeEach
public void setup() {
tikaMetadata = new Metadata();
}
@@ -183,9 +184,11 @@ public class TikaToXMPTest {
assertFalse( iter.hasNext() );
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void convert_nullInput_throw() throws TikaException {
+ assertThrows(IllegalArgumentException.class, () -> {
TikaToXMP.convert( null );
+ });
}
@Test
@@ -216,8 +219,10 @@ public class TikaToXMPTest {
assertNull( converter );
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void getConverter_nullInput_throw() throws TikaException {
- TikaToXMP.getConverter( null );
+ assertThrows(IllegalArgumentException.class, () -> {
+ TikaToXMP.getConverter(null);
+ });
}
}
diff --git a/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java b/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java
index d377276fd..c2c0c1d31 100644
--- a/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java
+++ b/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java
@@ -16,6 +16,13 @@
*/
package org.apache.tika.xmp;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Date;
import java.util.Properties;
@@ -26,20 +33,14 @@ import org.apache.tika.metadata.Property;
import org.apache.tika.metadata.PropertyTypeException;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.metadata.XMPRights;
-import org.junit.Before;
-import org.junit.Test;
import com.adobe.internal.xmp.XMPConst;
import com.adobe.internal.xmp.XMPException;
import com.adobe.internal.xmp.XMPMeta;
import com.adobe.internal.xmp.XMPUtils;
import com.adobe.internal.xmp.properties.XMPProperty;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class XMPMetadataTest {
private Metadata tikaMetadata;
@@ -48,7 +49,7 @@ public class XMPMetadataTest {
private static final String GENERIC_MIMETYPE = "generic/mimetype";
// --- SETUP ---
- @Before
+ @BeforeEach
public void setUp() throws Exception {
XMPMetadata.registerNamespace( DublinCore.NAMESPACE_URI_DC_TERMS,
DublinCore.PREFIX_DC_TERMS );
@@ -138,20 +139,26 @@ public class XMPMetadataTest {
assertNull( xmpMeta.get( TikaCoreProperties.FORMAT ) );
}
- @Test(expected = PropertyTypeException.class)
+ @Test
public void get_nullInput_throw() {
String notInitialized = null;
- xmpMeta.get( notInitialized );
+ assertThrows(PropertyTypeException.class, () -> {
+ xmpMeta.get(notInitialized);
+ });
}
- @Test(expected = PropertyTypeException.class)
+ @Test
public void get_notQualifiedKey_throw() {
- xmpMeta.get( "wrongKey" );
+ assertThrows(PropertyTypeException.class, () -> {
+ xmpMeta.get( "wrongKey" );
+ });
}
- @Test(expected = PropertyTypeException.class)
+ @Test
public void get_unknownPrefixKey_throw() {
- xmpMeta.get( "unknown:key" );
+ assertThrows(PropertyTypeException.class, () -> {
+ xmpMeta.get("unknown:key");
+ });
}
@Test
@@ -202,20 +209,26 @@ public class XMPMetadataTest {
assertEquals( GENERIC_MIMETYPE, xmpMeta.get( TikaCoreProperties.FORMAT ) );
}
- @Test(expected = PropertyTypeException.class)
+ @Test
public void set_nullInput_throw() {
String notInitialized = null;
- xmpMeta.set( notInitialized, "value" );
+ assertThrows(PropertyTypeException.class, () -> {
+ xmpMeta.set(notInitialized, "value");
+ });
}
- @Test(expected = PropertyTypeException.class)
+ @Test
public void set_notQualifiedKey_throw() {
- xmpMeta.set( "wrongKey", "value" );
+ assertThrows(PropertyTypeException.class, () -> {
+ xmpMeta.set("wrongKey", "value");
+ });
}
- @Test(expected = PropertyTypeException.class)
+ @Test
public void set_unknownPrefixKey_throw() {
- xmpMeta.set( "unknown:key", "value" );
+ assertThrows(PropertyTypeException.class, () -> {
+ xmpMeta.set("unknown:key", "value");
+ });
}
@Test
@@ -228,9 +241,11 @@ public class XMPMetadataTest {
checkArrayValues( values, "keyword" );
}
- @Test(expected = PropertyTypeException.class)
+ @Test
public void set_simplePropWithMultipleValues_throw() {
- xmpMeta.set( TikaCoreProperties.FORMAT, new String[] { "value1", "value2" } );
+ assertThrows(PropertyTypeException.class, () -> {
+ xmpMeta.set(TikaCoreProperties.FORMAT, new String[]{"value1", "value2"});
+ });
}
@Test
[tika] 05/10: TIKA-3758 -- upgrade to junit5 in tika-app
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 574e4defc0969be0513a1c5b20a5a21d9649c58c
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 05:34:32 2022 -0400
TIKA-3758 -- upgrade to junit5 in tika-app
---
tika-app/pom.xml | 7 -----
.../tika/cli/TikaCLIBatchCommandLineTest.java | 18 +++++------
.../tika/cli/TikaCLIBatchIntegrationTest.java | 21 +++++++------
.../test/java/org/apache/tika/cli/TikaCLITest.java | 36 +++++++++++-----------
.../tika/extractor/TestEmbeddedDocumentUtil.java | 6 ++--
5 files changed, 41 insertions(+), 47 deletions(-)
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 0c249c399..e494965aa 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -84,13 +84,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</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>
diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java
index e48c5fb49..3328db596 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.cli;
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.IOException;
import java.io.OutputStream;
@@ -31,9 +31,9 @@ import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.utils.ProcessUtils;
@@ -45,7 +45,7 @@ public class TikaCLIBatchCommandLineTest {
String testInputPathForCommandLine;
String escapedInputPathForCommandLine;
- @Before
+ @BeforeEach
public void init() {
testInput = Paths.get("testInput");
try {
@@ -64,7 +64,7 @@ public class TikaCLIBatchCommandLineTest {
BatchCommandLineBuilder.commandLineSafe(testInputPathForCommandLine);
}
- @After
+ @AfterEach
public void tearDown() {
try {
//TODO: refactor this to use our FileUtils.deleteDirectory(Path)
@@ -186,7 +186,7 @@ public class TikaCLIBatchCommandLineTest {
} catch (IllegalArgumentException e) {
ex = true;
}
- assertTrue("exception on <dir> <file>", ex);
+ assertTrue(ex, "exception on <dir> <file>");
}
private Map<String, String> mapify(String[] args) {
diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchIntegrationTest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchIntegrationTest.java
index 79c31caa9..ee7749d88 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchIntegrationTest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchIntegrationTest.java
@@ -18,10 +18,10 @@
package org.apache.tika.cli;
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.ByteArrayOutputStream;
import java.io.OutputStream;
@@ -34,9 +34,9 @@ import java.nio.file.StandardCopyOption;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -56,7 +56,7 @@ public class TikaCLIBatchIntegrationTest {
private ByteArrayOutputStream errBuffer = null;
private Path configFile = null;
- @Before
+ @BeforeEach
public void setup() throws Exception {
tempOutputDir = Files.createTempDirectory("tika-cli-test-batch-");
outBuffer = new ByteArrayOutputStream();
@@ -76,7 +76,7 @@ public class TikaCLIBatchIntegrationTest {
configFile, StandardCopyOption.REPLACE_EXISTING);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
System.setOut(new PrintStream(out, true, UTF_8.name()));
System.setErr(new PrintStream(err, true, UTF_8.name()));
@@ -199,7 +199,8 @@ public class TikaCLIBatchIntegrationTest {
}
private void assertFileExists(Path path) {
- assertTrue("File doesn't exist: " + path.toAbsolutePath(), Files.isRegularFile(path));
+ assertTrue(Files.isRegularFile(path),
+ "File doesn't exist: " + path.toAbsolutePath());
}
}
diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
index 72971f1f1..91599a649 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
@@ -17,10 +17,10 @@
package org.apache.tika.cli;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -30,11 +30,11 @@ import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.commons.io.FileUtils;
-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.apache.tika.exception.TikaException;
@@ -54,7 +54,7 @@ public class TikaCLITest {
private PrintStream stderr = null;
private String resourcePrefix;
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
ASYNC_OUTPUT_DIR = Files.createTempDirectory("tika-cli-async-");
ASYNC_CONFIG = Files.createTempFile("async-config-", ".xml");
@@ -74,7 +74,7 @@ public class TikaCLITest {
Files.write(ASYNC_CONFIG, xml.getBytes(UTF_8));
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
Files.delete(ASYNC_CONFIG);
FileUtils.deleteDirectory(ASYNC_OUTPUT_DIR.toFile());
@@ -82,11 +82,11 @@ public class TikaCLITest {
protected static void assertExtracted(File f, String allFiles) {
- assertTrue("File " + f.getName() + " not found in " + allFiles, f.exists());
+ assertTrue(f.exists(), "File " + f.getName() + " not found in " + allFiles);
- assertFalse("File " + f.getName() + " is a directory!", f.isDirectory());
+ assertFalse(f.isDirectory(), "File " + f.getName() + " is a directory!");
- assertTrue("File " + f.getName() + " wasn't extracted with contents", f.length() > 0);
+ assertTrue(f.length() > 0, "File " + f.getName() + " wasn't extracted with contents");
}
/**
@@ -95,7 +95,7 @@ public class TikaCLITest {
* clear outContent and errContent if they are not empty
* set outContent and errContent as System.out and System.err
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
resourcePrefix = testDataURI.toString();
stdout = System.out;
@@ -106,7 +106,7 @@ public class TikaCLITest {
/**
* Tears down the test. Returns the System.out and System.err
*/
- @After
+ @AfterEach
public void tearDown() {
System.setOut(stdout);
System.setErr(stderr);
@@ -179,8 +179,8 @@ public class TikaCLITest {
public void testHTMLOutput() throws Exception {
String content = getParamOutContent("-h", resourcePrefix + "alice.cli.test");
assertTrue(content.contains("html xmlns=\"http://www.w3.org/1999/xhtml"));
- assertTrue("Expanded <title></title> element should be present",
- content.contains("<title></title>"));
+ assertTrue(content.contains("<title></title>"),
+ "Expanded <title></title> element should be present");
content = getParamOutContent("-h", "--digest=SHA384", resourcePrefix + "alice.cli.test");
assertTrue(content.contains(
diff --git a/tika-app/src/test/java/org/apache/tika/extractor/TestEmbeddedDocumentUtil.java b/tika-app/src/test/java/org/apache/tika/extractor/TestEmbeddedDocumentUtil.java
index 593b6db05..3306f6f23 100644
--- a/tika-app/src/test/java/org/apache/tika/extractor/TestEmbeddedDocumentUtil.java
+++ b/tika-app/src/test/java/org/apache/tika/extractor/TestEmbeddedDocumentUtil.java
@@ -17,10 +17,10 @@
package org.apache.tika.extractor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.batch.DigestingAutoDetectParserFactory;
import org.apache.tika.config.TikaConfig;
[tika] 04/10: migrate to junit5 in tika-java7
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 5bfdf933e401a22b7d1fc00033c9eb380912745b
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 05:23:01 2022 -0400
migrate to junit5 in tika-java7
---
tika-java7/pom.xml | 7 ------
.../filetypedetector/TikaFileTypeDetectorTest.java | 26 +++++++++-------------
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/tika-java7/pom.xml b/tika-java7/pom.xml
index 3c451188d..a3bec12e5 100644
--- a/tika-java7/pom.xml
+++ b/tika-java7/pom.xml
@@ -91,13 +91,6 @@
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
- <!-- after we migrate everything to junit5, we can get rid of this -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<description>Java-7 reliant components, including FileTypeDetector implementations</description>
diff --git a/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java b/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java
index 48390e032..b21b7b358 100644
--- a/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java
+++ b/tika-java7/src/test/java/org/apache/tika/filetypedetector/TikaFileTypeDetectorTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.tika.filetypedetector;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.nio.file.Files;
@@ -25,16 +27,14 @@ import java.nio.file.spi.FileTypeDetector;
import java.util.Iterator;
import java.util.ServiceLoader;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
public class TikaFileTypeDetectorTest {
- @Rule
- public TemporaryFolder tempDir = new TemporaryFolder();
+ @TempDir
+ public Path tempDir;
private Path testDirectory = null;
@@ -42,9 +42,10 @@ public class TikaFileTypeDetectorTest {
private static final String TEST_HTML = "test.html";
private static final String TEST_UNRECOGNISED_EXTENSION = "test.unrecognisedextension";
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- testDirectory = tempDir.newFolder().toPath();
+ testDirectory = tempDir;
+ System.out.println(testDirectory.toAbsolutePath());
try (InputStream is = this.getClass().getResourceAsStream(TEST_CLASSPATH)) {
Files.copy(is, testDirectory.resolve(TEST_HTML));
}
@@ -53,10 +54,6 @@ public class TikaFileTypeDetectorTest {
}
}
- @After
- public void tearDown() throws Exception {
- }
-
@Test
public final void testDirectAccess() throws Exception {
String contentType = new TikaFileTypeDetector().probeContentType(testDirectory.resolve(TEST_HTML));
@@ -95,6 +92,5 @@ public class TikaFileTypeDetectorTest {
//o.a.sis.internal.storage.StoreTypeDetector appears with latest upgrade
//check that TikaFileTypeDetector appears at all
assertTrue(foundTika);
-
}
}
[tika] 09/10: upgrade to junit5 in tika-bundles
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 84582534c0eb65b5fc64569a82898642c903e8b3
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 06:16:11 2022 -0400
upgrade to junit5 in tika-bundles
---
tika-bundles/pom.xml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/tika-bundles/pom.xml b/tika-bundles/pom.xml
index 5a0c1e508..fd81b20cd 100644
--- a/tika-bundles/pom.xml
+++ b/tika-bundles/pom.xml
@@ -44,15 +44,6 @@
</dependency>
</dependencies>
</dependencyManagement>
- <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>
<scm>
<tag>2.2.1-rc2</tag>
[tika] 08/10: upgrade to junit5 in tika-fuzzing
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 71c9f9f200e853c41a1d2490702d4313e541c1b1
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 06:11:15 2022 -0400
upgrade to junit5 in tika-fuzzing
---
tika-fuzzing/pom.xml | 7 -------
tika-fuzzing/src/test/java/TestFuzzingCLI.java | 9 +++++----
tika-fuzzing/src/test/java/TestTransformer.java | 6 +++---
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index 3cc998806..fa4d1fe9e 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -79,13 +79,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <!-- after we migrate everything to junit5, we can get rid of this -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-fuzzing/src/test/java/TestFuzzingCLI.java b/tika-fuzzing/src/test/java/TestFuzzingCLI.java
index b0a6f7471..9a6009e2e 100644
--- a/tika-fuzzing/src/test/java/TestFuzzingCLI.java
+++ b/tika-fuzzing/src/test/java/TestFuzzingCLI.java
@@ -20,8 +20,9 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
import org.apache.tika.fuzzing.cli.FuzzingCLI;
import org.apache.tika.utils.ProcessUtils;
@@ -29,7 +30,7 @@ import org.apache.tika.utils.ProcessUtils;
public class TestFuzzingCLI {
@Test
- @Ignore
+ @Disabled
public void testBasic() throws Exception {
//convert to actual unit test
String inputDir = "";// fill in
@@ -42,7 +43,7 @@ public class TestFuzzingCLI {
}
@Test
- @Ignore
+ @Disabled
public void testMock() throws Exception {
//convert to actual unit test
Path inputDir = Paths.get(getClass().getResource("/test-documents").toURI());
diff --git a/tika-fuzzing/src/test/java/TestTransformer.java b/tika-fuzzing/src/test/java/TestTransformer.java
index 858413308..3adc4e3e1 100644
--- a/tika-fuzzing/src/test/java/TestTransformer.java
+++ b/tika-fuzzing/src/test/java/TestTransformer.java
@@ -22,15 +22,15 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.fuzzing.general.GeneralTransformer;
public class TestTransformer {
@Test
- @Ignore
+ @Disabled
public void testBasic() throws Exception {
//turn into actual unit test
Path path = Paths.get("");//put something meaningful here
[tika] 01/10: TIKA-3760 -- migrate to junit5 in tika-eval
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 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 {
[tika] 03/10: TIKA-3761 - migrate to junit5 in tika-example
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 27b4273d05bf2fab5113a6a20d4272a4fd00dd33
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 05:09:25 2022 -0400
TIKA-3761 - migrate to junit5 in tika-example
---
tika-example/pom.xml | 7 ----
.../tika/example/AdvancedTypeDetectorTest.java | 5 +--
.../tika/example/ContentHandlerExampleTest.java | 15 +++++----
.../tika/example/DumpTikaConfigExampleTest.java | 24 +++++++-------
.../tika/example/ExtractEmbeddedFilesTest.java | 12 +++----
.../tika/example/LanguageDetectorExampleTest.java | 8 ++---
.../tika/example/SimpleTextExtractorTest.java | 2 +-
.../tika/example/SimpleTypeDetectorTest.java | 2 +-
.../apache/tika/example/TestParsingExample.java | 37 ++++++++--------------
.../tika/example/TextStatsFromTikaEvalTest.java | 4 +--
.../apache/tika/example/TranslatorExampleTest.java | 8 ++---
11 files changed, 55 insertions(+), 69 deletions(-)
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index 301306f9b..ff5c7569a 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -120,13 +120,6 @@
<artifactId>spring-context</artifactId>
<version>${spring.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>
<description>This module contains examples of how to use Apache Tika.</description>
diff --git a/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java b/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java
index 0cf23218c..4f28f90d3 100755
--- a/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java
@@ -17,9 +17,10 @@
package org.apache.tika.example;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
@SuppressWarnings("deprecation")
public class AdvancedTypeDetectorTest {
diff --git a/tika-example/src/test/java/org/apache/tika/example/ContentHandlerExampleTest.java b/tika-example/src/test/java/org/apache/tika/example/ContentHandlerExampleTest.java
index 5a92bb4e9..d36e55a12 100644
--- a/tika-example/src/test/java/org/apache/tika/example/ContentHandlerExampleTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/ContentHandlerExampleTest.java
@@ -19,14 +19,14 @@ package org.apache.tika.example;
import static org.apache.tika.TikaTest.assertContains;
import static org.apache.tika.TikaTest.assertNotContained;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.apache.tika.exception.TikaException;
@@ -34,7 +34,7 @@ import org.apache.tika.exception.TikaException;
public class ContentHandlerExampleTest {
ContentHandlerExample example;
- @Before
+ @BeforeEach
public void setUp() {
example = new ContentHandlerExample();
}
@@ -42,7 +42,7 @@ public class ContentHandlerExampleTest {
@Test
public void testParseToPlainText() throws IOException, SAXException, TikaException {
String result = example.parseToPlainText().trim();
- assertEquals("Expected 'test', but got '" + result + "'", "test", result);
+ assertEquals("test", result, "Expected 'test', but got '" + result + "'");
}
@Test
@@ -91,7 +91,8 @@ public class ContentHandlerExampleTest {
assertEquals(3, result.size());
for (String chunk : result) {
- assertTrue("Chunk under max size", chunk.length() <= example.MAXIMUM_TEXT_CHUNK_SIZE);
+ assertTrue(chunk.length() <= example.MAXIMUM_TEXT_CHUNK_SIZE,
+ "Chunk under max size");
}
assertContains("This is in the header", result.get(0));
diff --git a/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java b/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
index 7138edfd7..e10e06f35 100644
--- a/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
@@ -18,8 +18,8 @@ package org.apache.tika.example;
import static java.nio.charset.StandardCharsets.UTF_16LE;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
@@ -28,9 +28,9 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.Charset;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.config.TikaConfigSerializer;
@@ -42,7 +42,7 @@ import org.apache.tika.parser.Parser;
public class DumpTikaConfigExampleTest {
private File configFile;
- @Before
+ @BeforeEach
public void setUp() {
try {
configFile = File.createTempFile("tmp", ".xml");
@@ -51,7 +51,7 @@ public class DumpTikaConfigExampleTest {
}
}
- @After
+ @AfterEach
public void tearDown() {
if (configFile != null && configFile.exists()) {
configFile.delete();
@@ -73,15 +73,15 @@ public class DumpTikaConfigExampleTest {
writer.close();
TikaConfig c = new TikaConfig(configFile);
- assertTrue(c.getParser().toString(), c.getParser() instanceof CompositeParser);
- assertTrue(c.getDetector().toString(),
- c.getDetector() instanceof CompositeDetector);
+ assertTrue(c.getParser() instanceof CompositeParser, c.getParser().toString());
+ assertTrue(c.getDetector() instanceof CompositeDetector,
+ c.getDetector().toString());
CompositeParser p = (CompositeParser) c.getParser();
- assertTrue("enough parsers?", p.getParsers().size() > 130);
+ assertTrue(p.getParsers().size() > 130, "enough parsers?");
CompositeDetector d = (CompositeDetector) c.getDetector();
- assertTrue("enough detectors?", d.getDetectors().size() > 3);
+ assertTrue(d.getDetectors().size() > 3, "enough detectors?");
//just try to load it into autodetect to make sure no errors are thrown
Parser auto = new AutoDetectParser(c);
diff --git a/tika-example/src/test/java/org/apache/tika/example/ExtractEmbeddedFilesTest.java b/tika-example/src/test/java/org/apache/tika/example/ExtractEmbeddedFilesTest.java
index a9b48cca8..b4aec1484 100644
--- a/tika-example/src/test/java/org/apache/tika/example/ExtractEmbeddedFilesTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/ExtractEmbeddedFilesTest.java
@@ -17,7 +17,7 @@
package org.apache.tika.example;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.nio.file.DirectoryStream;
@@ -25,22 +25,22 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class ExtractEmbeddedFilesTest {
ParsingExample parsingExample;
Path outputPath;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
parsingExample = new ParsingExample();
outputPath = Files.createTempDirectory("tika-ext-emb-example-");
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
//this does not act recursively, this only assumes single level directory
try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(outputPath)) {
diff --git a/tika-example/src/test/java/org/apache/tika/example/LanguageDetectorExampleTest.java b/tika-example/src/test/java/org/apache/tika/example/LanguageDetectorExampleTest.java
index 6ff1ce8b1..af0655199 100644
--- a/tika-example/src/test/java/org/apache/tika/example/LanguageDetectorExampleTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/LanguageDetectorExampleTest.java
@@ -17,17 +17,17 @@
package org.apache.tika.example;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class LanguageDetectorExampleTest {
LanguageDetectorExample languageDetectorExample;
- @Before
+ @BeforeEach
public void setUp() {
languageDetectorExample = new LanguageDetectorExample();
}
diff --git a/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java b/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
index e2db107c7..8ca4050af 100755
--- a/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
@@ -24,7 +24,7 @@ import java.io.File;
import java.io.PrintStream;
import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
diff --git a/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java b/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java
index f73eae2e4..b92ab60e8 100755
--- a/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java
@@ -22,7 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
diff --git a/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java b/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java
index e266e456a..bf9a4b774 100644
--- a/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java
+++ b/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java
@@ -17,35 +17,26 @@
package org.apache.tika.example;
-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.assertTrue;
import java.io.IOException;
import java.io.StringReader;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
+import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.serialization.JsonMetadataList;
-public class TestParsingExample {
+public class TestParsingExample extends TikaTest {
ParsingExample parsingExample;
- public static void assertContains(String needle, String haystack) {
- assertTrue("Should have found " + needle + " in: " + haystack, haystack.contains(needle));
- }
-
- public static void assertNotContains(String needle, String haystack) {
- assertFalse("Should not have found " + needle + " in: " + haystack,
- haystack.contains(needle));
- }
-
- @Before
+ @BeforeEach
public void setUp() {
parsingExample = new ParsingExample();
}
@@ -53,22 +44,22 @@ public class TestParsingExample {
@Test
public void testParseToStringExample() throws IOException, SAXException, TikaException {
String result = parsingExample.parseToStringExample().trim();
- assertEquals("Expected 'test', but got '" + result + "'", "test", result);
+ assertEquals("test", result, "enough detectors?");
}
@Test
public void testParseExample() throws IOException, SAXException, TikaException {
String result = parsingExample.parseExample().trim();
- assertEquals("Expected 'test', but got '" + result + "'", "test", result);
+ assertEquals("test", result, "Expected 'test', but got '" + result + "'");
}
@Test
public void testNoEmbeddedExample() throws IOException, SAXException, TikaException {
String result = parsingExample.parseNoEmbeddedExample();
assertContains("embed_0", result);
- assertNotContains("embed1/embed1a.txt", result);
- assertNotContains("embed3/embed3.txt", result);
- assertNotContains("When in the Course", result);
+ assertNotContained("embed1/embed1a.txt", result);
+ assertNotContained("embed3/embed3.txt", result);
+ assertNotContained("When in the Course", result);
}
@Test
@@ -84,8 +75,8 @@ public class TestParsingExample {
public void testRecursiveParserWrapperExample()
throws IOException, SAXException, TikaException {
List<Metadata> metadataList = parsingExample.recursiveParserWrapperExample();
- assertEquals("Number of embedded documents + 1 for the container document", 12,
- metadataList.size());
+ assertEquals(12, metadataList.size(),
+ "Number of embedded documents + 1 for the container document");
Metadata m = metadataList.get(6);
//this is the location the embed3.txt text file within the outer .docx
assertEquals("/embed1.zip/embed2.zip/embed3.zip/embed3.txt",
diff --git a/tika-example/src/test/java/org/apache/tika/example/TextStatsFromTikaEvalTest.java b/tika-example/src/test/java/org/apache/tika/example/TextStatsFromTikaEvalTest.java
index 273fb60f2..30f52ce5e 100644
--- a/tika-example/src/test/java/org/apache/tika/example/TextStatsFromTikaEvalTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/TextStatsFromTikaEvalTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.example;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TextStatsFromTikaEvalTest {
diff --git a/tika-example/src/test/java/org/apache/tika/example/TranslatorExampleTest.java b/tika-example/src/test/java/org/apache/tika/example/TranslatorExampleTest.java
index bd869e5a0..4ca556c32 100644
--- a/tika-example/src/test/java/org/apache/tika/example/TranslatorExampleTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/TranslatorExampleTest.java
@@ -17,17 +17,17 @@
package org.apache.tika.example;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Locale;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TranslatorExampleTest {
TranslatorExample translatorExample;
- @Before
+ @BeforeEach
public void setUp() {
translatorExample = new TranslatorExample();
}
[tika] 02/10: TIKA-3757 - migrate to junit5 in tika-translate
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 de04c1cdd9cb4d12d4db52cedb26369801b37c65
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 04:51:28 2022 -0400
TIKA-3757 - migrate to junit5 in tika-translate
---
tika-translate/pom.xml | 58 +++++++++-----------
.../translate/impl/CachedTranslatorTest.java | 39 ++++++-------
.../translate/impl/GoogleTranslatorTest.java | 24 ++++----
.../impl/JoshuaNetworkTranslatorTest.java | 37 ++++++-------
.../translate/impl/Lingo24TranslatorTest.java | 27 ++++-----
.../translate/impl/MarianTranslatorTest.java | 33 +++++------
.../translate/impl/MicrosoftTranslatorTest.java | 23 ++++----
.../translate/impl/MosesTranslatorTest.java | 16 +++---
.../language/translate/impl/RTGTranslatorTest.java | 64 +++++++++++-----------
.../translate/impl/YandexTranslatorTest.java | 52 +++++++++---------
10 files changed, 180 insertions(+), 193 deletions(-)
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index 4d8f6b0e1..41b77fa26 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -19,7 +19,8 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -126,39 +127,32 @@
<artifactId>tyrus-standalone-client</artifactId>
<version>2.0.2</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>
<reporting>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.3.0</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- <configuration>
- <jvmArgs>-Xmx256m</jvmArgs>
- <timeout>240000</timeout>
- <effort>max</effort>
- <failOnError>true</failOnError>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.3.0</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ <configuration>
+ <jvmArgs>-Xmx256m</jvmArgs>
+ <timeout>240000</timeout>
+ <effort>max</effort>
+ <failOnError>true</failOnError>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
<build>
@@ -239,7 +233,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <execute />
+ <execute/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java
index 55bac7815..65dc44627 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java
@@ -17,16 +17,13 @@
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-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 org.apache.tika.language.translate.impl.CachedTranslator;
-import org.apache.tika.language.translate.impl.GoogleTranslator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test harness for the {@link CachedTranslator}. Take care to choose your target language carefully
@@ -35,7 +32,7 @@ import org.apache.tika.language.translate.impl.GoogleTranslator;
public class CachedTranslatorTest {
private CachedTranslator cachedTranslator;
- @Before
+ @BeforeEach
public void setUp(){
cachedTranslator = new CachedTranslator(new GoogleTranslator());
}
@@ -45,8 +42,8 @@ public class CachedTranslatorTest {
for (int i = 0; i < 20; i++) {
cachedTranslator.translate("This is a test string to translate!", "en", "sv");
}
- assertEquals("Cache doesn't have a single translation pair!", cachedTranslator.getNumTranslationPairs(), 1);
- assertEquals("Cache has more than one element!", cachedTranslator.getNumTranslationsFor("en", "sv"), 1);
+ assertEquals(cachedTranslator.getNumTranslationPairs(), 1, "Cache doesn't have a single translation pair!");
+ assertEquals(cachedTranslator.getNumTranslationsFor("en", "sv"), 1, "Cache has more than one element!");
}
@Test
@@ -55,9 +52,9 @@ public class CachedTranslatorTest {
cachedTranslator.translate("This is a test string to translate!", "en", "no");
cachedTranslator.translate("This is a different string...", "en", "fr");
}
- assertEquals("Cache doesn't have two translation pairs!", cachedTranslator.getNumTranslationPairs(), 2);
- assertEquals("Cache has more than en to no translation!", cachedTranslator.getNumTranslationsFor("en", "no"), 1);
- assertEquals("Cache has more than en to fr translation!", cachedTranslator.getNumTranslationsFor("en", "fr"), 1);
+ assertEquals(cachedTranslator.getNumTranslationPairs(), 2, "Cache doesn't have two translation pairs!");
+ assertEquals(cachedTranslator.getNumTranslationsFor("en", "no"), 1, "Cache has more than en to no translation!");
+ assertEquals(cachedTranslator.getNumTranslationsFor("en", "fr"), 1, "Cache has more than en to fr translation!");
}
@Test
@@ -77,12 +74,12 @@ public class CachedTranslatorTest {
@Test
public void testCacheContains() throws Exception {
String text = "Text that should be long enough to detect a language from.";
- assertFalse("Cache should not contain a translation!",
- cachedTranslator.contains(text, "en", "it"));
+ assertFalse(cachedTranslator.contains(text, "en", "it"),
+ "Cache should not contain a translation!");
cachedTranslator.translate(text, "en", "it");
- assertTrue("Cache should contain a translation!",
- cachedTranslator.contains(text, "en", "it"));
- assertTrue("Cache should detect source language when checking if contains.",
- cachedTranslator.contains(text, "it"));
+ assertTrue(cachedTranslator.contains(text, "en", "it"),
+ "Cache should contain a translation!");
+ assertTrue(cachedTranslator.contains(text, "it"),
+ "Cache should detect source language when checking if contains.");
}
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java
index f1b872771..dcb6a9b8a 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java
@@ -17,11 +17,13 @@
package org.apache.tika.language.translate.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import org.junit.Before;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.language.translate.impl.GoogleTranslator;
@@ -38,11 +40,12 @@ public class GoogleTranslatorTest {
}
- @Before
+ @BeforeEach
public void setUp() {
translator = new GoogleTranslator();
}
+ @Test
public void testSimpleTranslate() {
String source = "hola senor";
String expected = "hello sir";
@@ -52,9 +55,8 @@ public class GoogleTranslatorTest {
try {
result = translator.translate(source, "es", "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(expected, result, "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -62,6 +64,7 @@ public class GoogleTranslatorTest {
}
}
+ @Test
public void testTranslateGuessLanguage() {
String source = "bonjour comment vas-tu";
String expected = "hello how are you";
@@ -71,9 +74,8 @@ public class GoogleTranslatorTest {
try {
result = translator.translate(source, "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(expected, result, "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java
index f04203185..10ca303ea 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java
@@ -16,28 +16,27 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tika.language.translate.impl.JoshuaNetworkTranslator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class JoshuaNetworkTranslatorTest {
+ JoshuaNetworkTranslator translator;
- JoshuaNetworkTranslator translator;
-
- @Before
- public void setUp() {
- translator = new JoshuaNetworkTranslator();
- }
+ @BeforeEach
+ public void setUp() {
+ translator = new JoshuaNetworkTranslator();
+ }
- @Test
- public void testSimpleSpanishToEnglishTranslation() throws Exception {
- String source = "hola";
- String expected = "hello";
- String translated = translator.translate(source, "spanish", "english");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
- }
+ @Test
+ public void testSimpleSpanishToEnglishTranslation() throws Exception {
+ String source = "hola";
+ String expected = "hello";
+ String translated = translator.translate(source, "spanish", "english");
+ if (translator.isAvailable()) {
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
+ }
+ }
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java
index ec89784de..08114b69b 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java
@@ -16,13 +16,12 @@
*/
package org.apache.tika.language.translate.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Before;
-
-import org.apache.tika.language.translate.impl.Lingo24Translator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test harness for the {@link Lingo24Translator}.
@@ -32,11 +31,12 @@ public class Lingo24TranslatorTest {
private Lingo24Translator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new Lingo24Translator();
}
+ @Test
public void testSimpleTranslate() {
String source = "Hola, hoy es un día genial para traducir";
String expected = "Hello, today is a great day to translate";
@@ -46,9 +46,9 @@ public class Lingo24TranslatorTest {
try {
result = translator.translate(source, "es", "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(
+ expected, result, "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -56,6 +56,7 @@ public class Lingo24TranslatorTest {
}
}
+ @Test
public void testTranslateGuessLanguage() {
String source = "C'est une merveilleuse journée pour traduction";
String expected = "It is a wonderful day for translation";
@@ -65,9 +66,9 @@ public class Lingo24TranslatorTest {
try {
result = translator.translate(source, "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(expected, result,
+ "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
index 22afc68c0..42bbf68fb 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
@@ -16,45 +16,40 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.AssumptionViolatedException;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class MarianTranslatorTest {
private MarianTranslator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new MarianTranslator();
}
@Test
public void testTranslate_English_Romanian() throws Exception {
+ assumeTrue(translator.isAvailable("en", "ro"));
String source = "Apache Tika is a wonderful tool";
String expected = "Apache Tika este un instrument minunat";
String translated = translator.translate(source, "en", "ro");
- if (translator.isAvailable("en", "ro")) {
- assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
- } else {
- throw new AssumptionViolatedException("Engine not available");
- }
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
public void testTranslate_Romanian_English() throws Exception {
+ assumeTrue(translator.isAvailable("ro", "en"));
String source = "Apache Tika este un instrument minunat";
String expected = "Apache Tika is a wonderful tool";
String translated = translator.translate(source, "ro", "en");
- if (translator.isAvailable("ro", "en")) {
- assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
- } else {
- throw new AssumptionViolatedException("Engine not available");
- }
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
@@ -62,8 +57,8 @@ public class MarianTranslatorTest {
String source = "Apache Tika is a wonderful tool";
String expected = "Apache Tika is a wonderful tool"; // Pattern from other Translators is to return source
String translated = translator.translate(source, "en", "zz");
- assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java
index b523178ef..5231ee158 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java
@@ -16,40 +16,41 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tika.language.translate.impl.MicrosoftTranslator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the {@link MicrosoftTranslator} class.
*/
public class MicrosoftTranslatorTest {
MicrosoftTranslator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new MicrosoftTranslator();
}
@Test
public void testSimpleTranslate() throws Exception {
+ assumeTrue(translator.isAvailable());
String source = "hello";
String expected = "salut";
String translated = translator.translate(source, "en", "fr");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
public void testSimpleDetectTranslate() throws Exception {
+ assumeTrue(translator.isAvailable());
String source = "hello";
String expected = "salut";
String translated = translator.translate(source, "fr");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java
index 7db39293d..40aca5a84 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java
@@ -16,26 +16,26 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tika.language.translate.impl.MosesTranslator;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public class MosesTranslatorTest {
MosesTranslator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new MosesTranslator();
}
@Test
public void testSimpleTranslate() throws Exception {
+ assumeTrue(translator.isAvailable());
String source = "hola";
String expected = "hello";
String translated = translator.translate(source, "sp", "en");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java
index 816f25510..8d5f458e7 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,50 +17,48 @@
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.Locale;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import org.apache.tika.language.translate.impl.RTGTranslator;
/**
* Test harness for the {@link RTGTranslator}.
- *
+ *
*/
public class RTGTranslatorTest {
- private RTGTranslator translator;
-
+ private RTGTranslator translator;
- @Before
- public void setUp() {
- translator = new RTGTranslator();
- }
- @Test
- public void testSimpleTranslate() {
- String source = "hola señor";
- String expected = "hello, sir.";
+ @BeforeEach
+ public void setUp() {
+ translator = new RTGTranslator();
+ }
- String result = null;
- if (translator.isAvailable()) {
- try {
- result = translator.translate(source);
- assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result.toLowerCase(Locale.getDefault()));
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
- }
+ @Test
+ public void testSimpleTranslate() {
+ assumeTrue(translator.isAvailable());
+ String source = "hola señor";
+ String expected = "hello, sir.";
+ String result = null;
+ try {
+ result = translator.translate(source);
+ assertNotNull(result);
+ assertEquals(expected, result.toLowerCase(Locale.getDefault()),
+ "Result: [" + result + "]: not equal to expected: [" + expected + "]");
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java
index 26ea73b41..b8802d961 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java
@@ -14,61 +14,60 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tika.language.translate.impl;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
import org.apache.tika.exception.TikaException;
import org.apache.tika.language.translate.impl.YandexTranslator;
-import org.junit.Before;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
/**
* Generic Tests to ensure that the RSS library behaves as expected
- * @author mark
*
+ * @author mark
*/
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+
public class YandexTranslatorTest {
private YandexTranslator translator;
-
- @Before
+
+ @BeforeEach
public void setUp() throws Exception {
this.translator = new YandexTranslator();
}
@Test
public void test1EN_ES_Translation() {
+ assumeTrue(translator.isAvailable());
String inputText = "Hello World!!!";
String expectedText = "Hola Mundo!!!";
- try{
- String transText = translator.translate(inputText, "en", "es");
- assertNotNull("Text not translated", transText);
- assumeTrue(expectedText.equals(transText));
- }
- catch(TikaException | IOException e){
- e.printStackTrace();
- fail(e.getMessage());
- }
+ try {
+ String transText = translator.translate(inputText, "en", "es");
+ assertNotNull(transText, "Text not translated");
+ assertEquals(expectedText, transText);
+ } catch (TikaException | IOException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
}
@Test
public void test2UNDEFINED_DE_ES_Translation() {
+ assumeTrue(translator.isAvailable());
String inputText = "Guten Tag!!!";
String expectedText = "Buen Día!!!";
try {
String transText = translator.translate(inputText, "es");
- assertNotNull("Text not translated", transText);
- assumeTrue(expectedText.equals(transText));
+ assertNotNull(transText, "Text not translated");
+ assertEquals(expectedText, transText);
} catch (TikaException | IOException e) {
e.printStackTrace();
fail(e.getMessage());
@@ -77,12 +76,13 @@ public class YandexTranslatorTest {
@Test
public void test3UNDEFINED_IT_EN_Translation() {
+ assumeTrue(translator.isAvailable());
String inputText = "Buona Sera!!!";
String expectedText = "Good Evening!!!";
try {
String transText = translator.translate(inputText, "en");
- assertNotNull("Text not translated", transText);
- assumeTrue(expectedText.equals(transText));
+ assertNotNull(transText, "Text not translated");
+ assertEquals(expectedText, transText);
} catch (TikaException | IOException e) {
e.printStackTrace();
fail(e.getMessage());
[tika] 07/10: TIKA-3759 -- upgrade to junit5 in tika-batch
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 6c1ec133f3d53630c115be844ad58f5e064d1790
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 06:08:58 2022 -0400
TIKA-3759 -- upgrade to junit5 in tika-batch
---
tika-batch/pom.xml | 7 ---
.../tika/batch/CommandLineParserBuilderTest.java | 2 +-
.../RecursiveParserWrapperFSConsumerTest.java | 4 +-
.../org/apache/tika/batch/fs/BatchDriverTest.java | 61 +++++++++++++---------
.../org/apache/tika/batch/fs/BatchProcessTest.java | 61 +++++++++++++---------
.../org/apache/tika/batch/fs/FSBatchTestBase.java | 8 +--
.../apache/tika/batch/fs/FSFileResourceTest.java | 6 +--
.../java/org/apache/tika/batch/fs/FSUtilTest.java | 22 +++-----
.../apache/tika/batch/fs/HandlerBuilderTest.java | 6 +--
.../tika/batch/fs/OutputStreamFactoryTest.java | 8 +--
.../tika/batch/fs/strawman/StrawmanTest.java | 2 +-
11 files changed, 100 insertions(+), 87 deletions(-)
diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml
index eedbeee94..7bcefed4d 100644
--- a/tika-batch/pom.xml
+++ b/tika-batch/pom.xml
@@ -64,13 +64,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <!-- after we migrate everything to junit5, we can get rid of this -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java b/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java
index 52ec0951e..e74802289 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java
@@ -20,7 +20,7 @@ package org.apache.tika.batch;
import java.io.InputStream;
import org.apache.commons.cli.Options;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.batch.builders.CommandLineParserBuilder;
import org.apache.tika.batch.fs.FSBatchTestBase;
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java b/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java
index 7a6432780..86aaf661c 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java
@@ -17,7 +17,7 @@
package org.apache.tika.batch;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,7 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.batch.fs.RecursiveParserWrapperFSConsumer;
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java
index 1efe117db..2643bd5c7 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java
@@ -17,9 +17,9 @@
package org.apache.tika.batch.fs;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -27,8 +27,9 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.apache.tika.batch.BatchProcessDriverCLI;
@@ -37,7 +38,8 @@ public class BatchDriverTest extends FSBatchTestBase {
//for debugging, turn logging off/on via resources/log4j2.properties for the driver
//and log4j2_process.properties for the process.
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15000)
public void oneHeavyHangTest() throws Exception {
//batch runner hits one heavy hang file, keep going
Path outputDir = getNewOutputDir("daemon-");
@@ -57,7 +59,8 @@ public class BatchDriverTest extends FSBatchTestBase {
readFileToString(outputDir.resolve("test2_ok.xml.xml"), UTF_8));
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void restartOnFullHangTest() throws Exception {
//batch runner hits more heavy hangs than threads; needs to restart
Path outputDir = getNewOutputDir("daemon-");
@@ -75,7 +78,8 @@ public class BatchDriverTest extends FSBatchTestBase {
readFileToString(outputDir.resolve("test6_ok.xml.xml"), UTF_8));
}
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15000)
public void noRestartTest() throws Exception {
Path outputDir = getNewOutputDir("daemon-");
@@ -93,12 +97,13 @@ public class BatchDriverTest extends FSBatchTestBase {
assertFalse(driver.isUserInterrupted());
assertEquals(2, countChildren(outputDir));
Path test2 = outputDir.resolve("test2_norestart.xml.xml");
- assertTrue("test2_norestart.xml", Files.exists(test2));
+ assertTrue(Files.exists(test2), "test2_norestart.xml");
Path test3 = outputDir.resolve("test3_ok.xml.xml");
- assertFalse("test3_ok.xml", Files.exists(test3));
+ assertFalse(Files.exists(test3), "test3_ok.xml");
}
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15000)
public void restartOnOOMTest() throws Exception {
//batch runner hits more heavy hangs than threads; needs to restart
Path outputDir = getNewOutputDir("daemon-");
@@ -115,7 +120,8 @@ public class BatchDriverTest extends FSBatchTestBase {
readFileToString(outputDir.resolve("test2_ok.xml.xml"), UTF_8));
}
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void allHeavyHangsTestWithStarvedCrawler() throws Exception {
//this tests that if all consumers are hung and the crawler is
//waiting to add to the queue, there isn't deadlock. The BatchProcess should
@@ -133,7 +139,8 @@ public class BatchDriverTest extends FSBatchTestBase {
readFileToString(outputDir.resolve("test6_ok.xml.xml"), UTF_8));
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void maxRestarts() throws Exception {
//tests that maxRestarts works
//if -maxRestarts is not correctly removed from the commandline,
@@ -154,7 +161,8 @@ public class BatchDriverTest extends FSBatchTestBase {
assertEquals(3, countChildren(outputDir));
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void maxRestartsBadParameter() throws Exception {
//tests that maxRestarts must be followed by an Integer
Path outputDir = getNewOutputDir("allHeavyHangsStarvedCrawler-");
@@ -171,10 +179,11 @@ public class BatchDriverTest extends FSBatchTestBase {
} catch (IllegalArgumentException e) {
ex = true;
}
- assertTrue("IllegalArgumentException should have been thrown", ex);
+ assertTrue(ex, "IllegalArgumentException should have been thrown");
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void testNoRestartIfProcessFails() throws Exception {
//tests that if something goes horribly wrong with FSBatchProcessCLI
//the driver will not restart it again and again
@@ -191,7 +200,8 @@ public class BatchDriverTest extends FSBatchTestBase {
assertEquals(0, driver.getNumRestarts());
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void testNoRestartIfProcessFailsTake2() throws Exception {
Path outputDir = getNewOutputDir("nostart-norestart-");
Map<String, String> args = new HashMap<>();
@@ -206,7 +216,8 @@ public class BatchDriverTest extends FSBatchTestBase {
assertEquals(0, driver.getNumRestarts());
}
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void testSystemExit() throws Exception {
Path outputDir = getNewOutputDir("system-exit");
Map<String, String> args = new HashMap<>();
@@ -218,8 +229,8 @@ public class BatchDriverTest extends FSBatchTestBase {
assertEquals(6, countChildren(outputDir));
assertTrue(driver.getNumRestarts() > 1);
for (int i = 0; i < 3; i++) {
- assertEquals("problem with " + i, 0,
- Files.size(outputDir.resolve("test" + i + "_system_exit.xml.xml")));
+ assertEquals(0, Files.size(outputDir.resolve("test" + i + "_system_exit.xml.xml")),
+ "problem with " + i);
}
//sys exit may prevent test3 from running successfully
for (int i = 5; i < 6; i++) {
@@ -228,8 +239,9 @@ public class BatchDriverTest extends FSBatchTestBase {
}
}
- @Test(timeout = 60000)
- @Ignore("Java 11-ea+23 makes outputstreams uninterruptible")
+ @Test
+ @Disabled("Java 11-ea+23 makes outputstreams uninterruptible")
+ @Timeout(60000)
public void testThreadInterrupt() throws Exception {
Path outputDir = getNewOutputDir("thread-interrupt");
Map<String, String> args = new HashMap<>();
@@ -241,8 +253,9 @@ public class BatchDriverTest extends FSBatchTestBase {
assertEquals(6, countChildren(outputDir));
for (int i = 0; i < 3; i++) {
- assertEquals("problem with " + i, 0,
- Files.size(outputDir.resolve("test" + i + "_thread_interrupt.xml.xml")));
+ assertEquals(0,
+ Files.size(outputDir.resolve("test" + i + "_thread_interrupt.xml.xml")),
+ "problem with " + i);
}
//sys exit may prevent test3 from running successfully
for (int i = 5; i < 6; i++) {
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java
index 5906d4e70..3b3894767 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java
@@ -17,10 +17,10 @@
package org.apache.tika.batch.fs;
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.nio.file.Files;
@@ -29,8 +29,9 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.apache.tika.batch.BatchProcess;
import org.apache.tika.batch.BatchProcessDriverCLI;
@@ -39,10 +40,11 @@ import org.apache.tika.batch.BatchProcessDriverCLI;
* This runs a single process. This was useful during development,
* but we don't need it because it is duplicative of {@link BatchDriverTest}
*/
-@Ignore("Batch Driver is the integration test")
+@Disabled("Batch Driver is the integration test")
public class BatchProcessTest extends FSBatchTestBase {
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15000)
public void oneHeavyHangTest() throws Exception {
Path outputDir = getNewOutputDir("one_heavy_hang-");
@@ -59,7 +61,8 @@ public class BatchProcessTest extends FSBatchTestBase {
}
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15000)
public void allHeavyHangsTest() throws Exception {
//each of the three threads hits a heavy hang. The BatchProcess runs into
//all timedouts and shuts down.
@@ -71,14 +74,16 @@ public class BatchProcessTest extends FSBatchTestBase {
assertEquals(3, countChildren(outputDir));
for (Path hvyHang : listPaths(outputDir)) {
assertTrue(Files.exists(hvyHang));
- assertEquals("file length for " + hvyHang.getFileName() + " should be 0, but is: " +
- Files.size(hvyHang), 0, Files.size(hvyHang));
+ assertEquals(0, Files.size(hvyHang),
+ "file length for " + hvyHang.getFileName() + " should be 0, but is: " +
+ Files.size(hvyHang));
}
assertContains(BatchProcess.BATCH_CONSTANTS.BATCH_PROCESS_FATAL_MUST_RESTART.toString(),
streamStrings.getErrString());
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void allHeavyHangsTestWithCrazyNumberConsumersTest() throws Exception {
Path outputDir = getNewOutputDir("allHeavyHangsCrazyNumberConsumers-");
Map<String, String> args = getDefaultArgs("heavy_heavy_hangs", outputDir);
@@ -101,7 +106,8 @@ public class BatchProcessTest extends FSBatchTestBase {
streamStrings.getErrString());
}
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void allHeavyHangsTestWithStarvedCrawler() throws Exception {
//this tests that if all consumers are hung and the crawler is
//waiting to add to the queue, there isn't deadlock. The batchrunner should
@@ -126,7 +132,8 @@ public class BatchProcessTest extends FSBatchTestBase {
assertContains("Crawler timed out", streamStrings.getErrString());
}
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15000)
public void outOfMemory() throws Exception {
//the first consumer should sleep for 10 seconds
//the second should be tied up in a heavy hang
@@ -152,7 +159,8 @@ public class BatchProcessTest extends FSBatchTestBase {
}
- @Test(timeout = 15000)
+ @Test
+ @Timeout(15000)
public void noRestart() throws Exception {
Path outputDir = getNewOutputDir("no_restart");
@@ -164,9 +172,9 @@ public class BatchProcessTest extends FSBatchTestBase {
StreamStrings streamStrings = ex.execute();
Path test2 = outputDir.resolve("test2_norestart.xml.xml");
- assertTrue("test2_norestart.xml", Files.exists(test2));
+ assertTrue(Files.exists(test2), "test2_norestart.xml");
Path test3 = outputDir.resolve("test3_ok.xml.xml");
- assertFalse("test3_ok.xml", Files.exists(test3));
+ assertFalse(Files.exists(test3), "test3_ok.xml");
assertContains("exitStatus=" + BatchProcessDriverCLI.PROCESS_NO_RESTART_EXIT_CODE,
streamStrings.getOutString());
assertContains("causeForTermination='MAIN_LOOP_EXCEPTION_NO_RESTART'",
@@ -180,7 +188,8 @@ public class BatchProcessTest extends FSBatchTestBase {
* If this fails, then interruptible parsers (e.g. those with
* nio channels) will be interrupted and there will be corrupted data.
*/
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void testWaitAfterEarlyTermination() throws Exception {
Path outputDir = getNewOutputDir("wait_after_early_termination");
@@ -203,7 +212,8 @@ public class BatchProcessTest extends FSBatchTestBase {
streamStrings.getOutString());
}
- @Test(timeout = 60000)
+ @Test
+ @Timeout(60000)
public void testTimeOutAfterBeingAskedToShutdown() throws Exception {
Path outputDir = getNewOutputDir("timeout_after_early_termination");
@@ -224,7 +234,8 @@ public class BatchProcessTest extends FSBatchTestBase {
streamStrings.getOutString());
}
- @Test(timeout = 10000)
+ @Test
+ @Timeout(10000)
public void testRedirectionOfStreams() throws Exception {
//test redirection of system.err to system.out
Path outputDir = getNewOutputDir("noisy_parsers");
@@ -241,7 +252,8 @@ public class BatchProcessTest extends FSBatchTestBase {
assertNotContained(stderr, streamStrings.getErrString());
}
- @Test(timeout = 10000)
+ @Test
+ @Timeout(10000)
public void testConsumersManagerInitHang() throws Exception {
Path outputDir = getNewOutputDir("init_hang");
@@ -256,7 +268,8 @@ public class BatchProcessTest extends FSBatchTestBase {
streamStrings.getOutString());
}
- @Test(timeout = 10000)
+ @Test
+ @Timeout(10000)
public void testConsumersManagerShutdownHang() throws Exception {
Path outputDir = getNewOutputDir("shutdown_hang");
@@ -289,8 +302,8 @@ public class BatchProcessTest extends FSBatchTestBase {
Path test1 = outputDir.resolve("test1.xml.json");
Path test2 = outputDir.resolve("sub1a/test2.xml.json");
Path test3 = outputDir.resolve("sub1a/sub2a/test3.xml.json");
- assertTrue("test1 exists", Files.exists(test1));
- assertTrue("test1 length > 10", Files.size(test1) > 10);
+ assertTrue(Files.exists(test1), "test1 exists");
+ assertTrue(Files.size(test1) > 10, "test1 length > 10");
assertTrue(Files.exists(test3) && Files.size(test3) > 10);
Path test2Dir = outputDir.resolve("sub1a");
//should be just the subdirectory, no actual test2 file
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
index 4ea394718..24c7cadac 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
@@ -39,8 +39,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import org.apache.tika.TikaTest;
import org.apache.tika.batch.BatchProcess;
@@ -68,14 +68,14 @@ public abstract class FSBatchTestBase extends TikaTest {
private static Path outputRoot = null;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
Path testOutput = Paths.get("target/test-classes/test-output");
Files.createDirectories(testOutput);
outputRoot = Files.createTempDirectory(testOutput, "tika-batch-output-root-");
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
//not ideal, but should be ok for testing
//see caveat in TikaCLITest's textExtract
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSFileResourceTest.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSFileResourceTest.java
index b4a7b9cff..2bb795481 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSFileResourceTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSFileResourceTest.java
@@ -17,13 +17,13 @@
package org.apache.tika.batch.fs;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FSFileResourceTest {
@Test
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSUtilTest.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSUtilTest.java
index f0377c6b1..7b2adc072 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSUtilTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSUtilTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.tika.batch.fs;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FSUtilTest {
@@ -30,20 +30,14 @@ public class FSUtilTest {
Path cwd = Paths.get(".");
String windows = "C:/temp/file.txt";
String linux = "/root/dir/file.txt";
- boolean ex = false;
- try {
- FSUtil.resolveRelative(cwd, windows);
- } catch (IllegalArgumentException e) {
- ex = true;
- }
+ //this test does not work on linux
+ // assertThrows(IllegalArgumentException.class, () -> {
+ // System.out.println(FSUtil.resolveRelative(cwd, windows));
+ //});
- try {
+ assertThrows(IllegalArgumentException.class, () -> {
FSUtil.resolveRelative(cwd, linux);
- } catch (IllegalArgumentException e) {
- ex = true;
- }
-
- assertTrue("IllegalArgumentException should have been thrown", ex);
+ });
}
}
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/HandlerBuilderTest.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/HandlerBuilderTest.java
index c353be9b2..0de3db570 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/HandlerBuilderTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/HandlerBuilderTest.java
@@ -17,13 +17,13 @@
package org.apache.tika.batch.fs;
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.nio.file.Path;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.batch.BatchProcess;
import org.apache.tika.batch.ParallelFileProcessingResult;
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/OutputStreamFactoryTest.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/OutputStreamFactoryTest.java
index 5d5d292c6..dab260c8c 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/OutputStreamFactoryTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/OutputStreamFactoryTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.tika.batch.fs;
-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.util.Map;
import java.util.concurrent.ExecutionException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.batch.BatchProcess;
import org.apache.tika.batch.ParallelFileProcessingResult;
@@ -47,7 +47,7 @@ public class OutputStreamFactoryTest extends FSBatchTestBase {
illegalState = true;
}
}
- assertTrue("Should have been an illegal state exception", illegalState);
+ assertTrue(illegalState, "Should have been an illegal state exception");
}
@Test
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/strawman/StrawmanTest.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/strawman/StrawmanTest.java
index f123c701d..61776ae6b 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/strawman/StrawmanTest.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/strawman/StrawmanTest.java
@@ -18,7 +18,7 @@
package org.apache.tika.batch.fs.strawman;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class StrawmanTest {
//TODO: actually write some tests!!!