You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/07/28 20:03:36 UTC
[tika] 01/02: TIKA-3499 -- tika-pipes
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 f181fc4bb5b9e3daf73107ad5c29dc0660fed905
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 28 11:42:46 2021 -0400
TIKA-3499 -- tika-pipes
---
tika-pipes/pom.xml | 9 ---------
.../pipes/emitter/opensearch/OpenSearchClientTest.java | 2 +-
.../tika/pipes/emitter/solr/SolrEmitterDevTest.java | 6 +++---
.../apache/tika/pipes/fetcher/http/HttpFetcherTest.java | 8 ++++----
.../org/apache/tika/pipes/fetcher/s3/TestS3Fetcher.java | 6 +++---
.../src/test/java/TestCSVPipesIterator.java | 15 +++++++++------
.../pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java | 16 ++++++++--------
.../tika/pipes/pipesiterator/s3/TestS3PipesIterator.java | 8 ++++----
8 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index 3bb13ea..6f3bc52 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -36,15 +36,6 @@
<module>tika-pipes-iterators</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-pipes/tika-emitters/tika-emitter-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java b/tika-pipes/tika-emitters/tika-emitter-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java
index e92607f..34653dc 100644
--- a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java
+++ b/tika-pipes/tika-emitters/tika-emitter-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.pipes.emitter.opensearch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java b/tika-pipes/tika-emitters/tika-emitter-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java
index 8e60daf..cb72665 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java
+++ b/tika-pipes/tika-emitters/tika-emitter-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java
@@ -21,8 +21,8 @@ import java.util.Date;
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.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -33,7 +33,7 @@ import org.apache.tika.metadata.filter.FieldNameMappingFilter;
* running instance of Solr. Please add unit tests to the
* tika-integration-tests/tika-pipes-solr-integration-tests
*/
-@Ignore
+@Disabled
public class SolrEmitterDevTest {
@Test
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java b/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java
index 82f14af..718dde3 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java
+++ b/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.pipes.fetcher.http;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
import java.nio.file.Files;
@@ -25,14 +25,14 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.zip.GZIPInputStream;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.io.TemporaryResources;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.pipes.fetcher.FetcherManager;
-@Ignore("requires network connectivity")
+@Disabled("requires network connectivity")
public class HttpFetcherTest {
@Test
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/java/org/apache/tika/pipes/fetcher/s3/TestS3Fetcher.java b/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/java/org/apache/tika/pipes/fetcher/s3/TestS3Fetcher.java
index a00f5c3..0a05ac2 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/java/org/apache/tika/pipes/fetcher/s3/TestS3Fetcher.java
+++ b/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/java/org/apache/tika/pipes/fetcher/s3/TestS3Fetcher.java
@@ -23,14 +23,14 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.Collections;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.pipes.fetcher.Fetcher;
import org.apache.tika.pipes.fetcher.FetcherManager;
-@Ignore("write actual unit tests")
+@Disabled("write actual unit tests")
public class TestS3Fetcher {
private static final String FETCH_STRING = "";
private final Path outputFile = Paths.get("");
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/TestCSVPipesIterator.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/TestCSVPipesIterator.java
index 1293ea6..173524f 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/TestCSVPipesIterator.java
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/TestCSVPipesIterator.java
@@ -16,7 +16,8 @@
*/
import static org.apache.tika.pipes.pipesiterator.PipesIterator.COMPLETED_SEMAPHORE;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -30,7 +31,7 @@ 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.apache.tika.pipes.FetchEmitTuple;
import org.apache.tika.pipes.pipesiterator.csv.CSVPipesIterator;
@@ -83,16 +84,18 @@ public class TestCSVPipesIterator {
}
}
- @Test(expected = RuntimeException.class)
+ @Test
public void testBadFetchKeyCol() throws Exception {
Path p = get("test-simple.csv");
CSVPipesIterator it = new CSVPipesIterator();
it.setFetcherName("fs");
it.setCsvPath(p);
- it.setFetchKeyColumn("fetchKeyDoesntExist");
- for (FetchEmitTuple t : it) {
+ assertThrows(RuntimeException.class, () -> {
+ it.setFetchKeyColumn("fetchKeyDoesntExist");
+ for (FetchEmitTuple t : it) {
- }
+ }
+ });
}
private Path get(String testFileName) throws Exception {
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/java/org/apache/tika/pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/java/org/apache/tika/pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java
index 177950d..08bfbeb 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/java/org/apache/tika/pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/java/org/apache/tika/pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java
@@ -16,9 +16,9 @@
*/
package org.apache.tika.pipes.pipesiterator.jdbc;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -39,9 +39,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
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.pipes.FetchEmitTuple;
import org.apache.tika.pipes.pipesiterator.PipesIterator;
@@ -54,7 +54,7 @@ public class TestJDBCPipesIterator {
static Connection CONNECTION;
static Path DB_DIR;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
DB_DIR = Files.createTempDirectory("tika-jdbc-pipesiterator-test-");
@@ -79,7 +79,7 @@ public class TestJDBCPipesIterator {
}
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
CONNECTION.close();
FileUtils.deleteDirectory(DB_DIR.toFile());
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/java/org/apache/tika/pipes/pipesiterator/s3/TestS3PipesIterator.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/java/org/apache/tika/pipes/pipesiterator/s3/TestS3PipesIterator.java
index c647ea6..704622e 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/java/org/apache/tika/pipes/pipesiterator/s3/TestS3PipesIterator.java
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/java/org/apache/tika/pipes/pipesiterator/s3/TestS3PipesIterator.java
@@ -16,7 +16,7 @@
*/
package org.apache.tika.pipes.pipesiterator.s3;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,13 +29,13 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.tika.pipes.FetchEmitTuple;
import org.apache.tika.pipes.pipesiterator.PipesIterator;
-@Ignore("turn into an actual unit test")
+@Disabled("turn into an actual unit test")
public class TestS3PipesIterator {