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/07 14:50:48 UTC
[tika] branch main updated: TIKA-3461 -- refactor tika-pipes
integration tests to modularize tests and move to higher level module built
after tika-app and tika-server
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
The following commit(s) were added to refs/heads/main by this push:
new 1b1e84a TIKA-3461 -- refactor tika-pipes integration tests to modularize tests and move to higher level module built after tika-app and tika-server
1b1e84a is described below
commit 1b1e84a9cbd2cfa4621a820ec19cebb5aea5dc23
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 7 10:49:58 2021 -0400
TIKA-3461 -- refactor tika-pipes integration tests to modularize tests and move to higher level module built after tika-app and tika-server
---
pom.xml | 1 +
tika-integration-tests/pom.xml | 63 ++++++++++++++++++++
.../pom.xml | 68 ++++++++++++++++++++++
.../opensearch/tests}/OpenSearchTestClient.java | 2 +-
.../opensearch/tests}/TikaPipesOpenSearchTest.java | 12 ++--
.../resources/opensearch/opensearch-mappings.json | 0
.../opensearch-parent-child-mappings.json | 0
.../opensearch/tika-config-opensearch.xml | 0
.../resources/pipes-fork-server-custom-log4j2.xml | 0
.../tika-pipes-s3-integration-tests/pom.xml | 59 +++++++++++++++++++
.../tika/pipes/s3/tests}/PipeIntegrationTests.java | 3 +-
.../resources/pipes-fork-server-custom-log4j2.xml | 0
.../src/test/resources/tika-config-s3ToFs.xml | 0
.../src/test/resources/tika-config-s3Tos3.xml | 0
.../tika-pipes-solr-integration-tests}/pom.xml | 58 +++---------------
.../tika/pipes/solr/tests}/TikaPipesSolr6Test.java | 2 +-
.../pipes/solr/tests}/TikaPipesSolr6ZkTest.java | 2 +-
.../tika/pipes/solr/tests}/TikaPipesSolr7Test.java | 2 +-
.../pipes/solr/tests}/TikaPipesSolr7ZkTest.java | 2 +-
.../tika/pipes/solr/tests}/TikaPipesSolr8Test.java | 2 +-
.../pipes/solr/tests}/TikaPipesSolr8ZkTest.java | 2 +-
.../pipes/solr/tests}/TikaPipesSolrTestBase.java | 7 +--
.../src/test/resources/log4j2.xml | 0
.../resources/pipes-fork-server-custom-log4j2.xml | 0
.../test/resources/tika-async-log4j2.properties | 0
.../src/test/resources/tika-config-solr-urls.xml | 0
tika-pipes/pom.xml | 1 -
27 files changed, 216 insertions(+), 70 deletions(-)
diff --git a/pom.xml b/pom.xml
index bdc3f73..fa057a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
<module>tika-app</module>
<module>tika-pipes</module>
<module>tika-server</module>
+ <module>tika-integration-tests</module>
<module>tika-eval</module>
<module>tika-fuzzing</module>
<module>tika-translate</module>
diff --git a/tika-integration-tests/pom.xml b/tika-integration-tests/pom.xml
new file mode 100644
index 0000000..5913c94
--- /dev/null
+++ b/tika-integration-tests/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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
+
+ 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. See the License for the
+ specific language governing permissions and limitations
+ 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">
+ <parent>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-integration-tests</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>tika-pipes-solr-integration-tests</module>
+ <module>tika-pipes-opensearch-integration-tests</module>
+ <module>tika-pipes-s3-integration-tests</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-serialization</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
new file mode 100644
index 0000000..880461c
--- /dev/null
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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
+
+ 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. See the License for the
+ specific language governing permissions and limitations
+ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tika-integration-tests</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-pipes-opensearch-integration-tests</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>${test.containers.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-app</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-emitter-opensearch</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/OpenSearchTestClient.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/OpenSearchTestClient.java
similarity index 99%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/OpenSearchTestClient.java
rename to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/OpenSearchTestClient.java
index 297891e..ca3abe1 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/OpenSearchTestClient.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/OpenSearchTestClient.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.opensearch;
+package org.apache.tika.pipes.opensearch.tests;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/TikaPipesOpenSearchTest.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
similarity index 96%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/TikaPipesOpenSearchTest.java
rename to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
index a6b6a5e..94ea829 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/TikaPipesOpenSearchTest.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.opensearch;
+package org.apache.tika.pipes.opensearch.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -35,7 +35,6 @@ import org.testcontainers.utility.DockerImageName;
import org.apache.tika.cli.TikaCLI;
import org.apache.tika.client.HttpClientFactory;
-import org.apache.tika.pipes.PipeIntegrationTests;
import org.apache.tika.pipes.emitter.opensearch.JsonResponse;
import org.apache.tika.pipes.emitter.opensearch.OpenSearchEmitter;
@@ -80,7 +79,7 @@ public class TikaPipesOpenSearchTest {
int tries = 0;
JsonResponse response = null;
//need to wait a bit sometimes before OpenSearch is up
- while (status != 200 && tries++ < 3) {
+ while (status != 200 && tries++ < 20) {
response = client.putJson(openSearchEndpoint, mappings);
if (status != 200) {
Thread.sleep(1000);
@@ -88,7 +87,8 @@ public class TikaPipesOpenSearchTest {
status = response.getStatus();
}
if (status != 200) {
- throw new IllegalArgumentException("couldn't create index/add mappings");
+ throw new IllegalArgumentException("couldn't create index/add mappings: " +
+ response);
}
assertTrue(response.getJson().get("acknowledged").asBoolean());
assertEquals("testcol", response.getJson().get("index").asText());
@@ -111,12 +111,12 @@ public class TikaPipesOpenSearchTest {
File tikaConfigFile = new File("target", "ta-opensearch.xml");
File log4jPropFile = new File("target", "tmp-log4j2.xml");
- try (InputStream is = PipeIntegrationTests.class
+ try (InputStream is = TikaPipesOpenSearchTest.class
.getResourceAsStream("/pipes-fork-server-custom-log4j2.xml")) {
FileUtils.copyInputStreamToFile(is, log4jPropFile);
}
String tikaConfigTemplateXml;
- try (InputStream is = PipeIntegrationTests.class
+ try (InputStream is = TikaPipesOpenSearchTest.class
.getResourceAsStream("/opensearch/tika-config-opensearch.xml")) {
tikaConfigTemplateXml = IOUtils.toString(is, StandardCharsets.UTF_8);
}
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/opensearch/opensearch-mappings.json b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/opensearch-mappings.json
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/opensearch/opensearch-mappings.json
rename to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/opensearch-mappings.json
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/opensearch/opensearch-parent-child-mappings.json b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/opensearch-parent-child-mappings.json
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/opensearch/opensearch-parent-child-mappings.json
rename to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/opensearch-parent-child-mappings.json
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml
rename to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
similarity index 100%
copy from tika-pipes/tika-pipes-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
copy to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
diff --git a/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
new file mode 100644
index 0000000..67f75fd
--- /dev/null
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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
+
+ 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. See the License for the
+ specific language governing permissions and limitations
+ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tika-integration-tests</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-pipes-s3-integration-tests</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-fetcher-s3</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-pipes-iterator-s3</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-emitter-s3</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/PipeIntegrationTests.java b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/java/org/apache/tika/pipes/s3/tests/PipeIntegrationTests.java
similarity index 99%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/PipeIntegrationTests.java
rename to tika-integration-tests/tika-pipes-s3-integration-tests/src/test/java/org/apache/tika/pipes/s3/tests/PipeIntegrationTests.java
index 8112142..28d82dc 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/PipeIntegrationTests.java
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/java/org/apache/tika/pipes/s3/tests/PipeIntegrationTests.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.pipes;
+package org.apache.tika.pipes.s3.tests;
import java.io.IOException;
import java.io.InputStream;
@@ -43,6 +43,7 @@ import org.junit.Test;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
+import org.apache.tika.pipes.FetchEmitTuple;
import org.apache.tika.pipes.emitter.Emitter;
import org.apache.tika.pipes.emitter.EmitterManager;
import org.apache.tika.pipes.emitter.s3.S3Emitter;
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
similarity index 100%
copy from tika-pipes/tika-pipes-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
copy to tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-s3ToFs.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3ToFs.xml
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-s3ToFs.xml
rename to tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3ToFs.xml
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-s3Tos3.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3Tos3.xml
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-s3Tos3.xml
rename to tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3Tos3.xml
diff --git a/tika-pipes/tika-pipes-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
similarity index 64%
rename from tika-pipes/tika-pipes-integration-tests/pom.xml
rename to tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
index db5805d..9291c9c 100644
--- a/tika-pipes/tika-pipes-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
@@ -17,59 +17,20 @@
specific language governing permissions and limitations
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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>tika-pipes</artifactId>
+ <artifactId>tika-integration-tests</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-pipes-integration-tests</artifactId>
+ <artifactId>tika-pipes-solr-integration-tests</artifactId>
<dependencies>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-fetcher-s3</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-pipes-iterator-s3</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-emitter-s3</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-serialization</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${test.containers.version}</version>
@@ -141,12 +102,7 @@
</exclusions>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-emitter-opensearch</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
+
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
similarity index 96%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
index 08d9e36..9ec9bee 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.solrtest;
+package org.apache.tika.pipes.solr.tests;
public class TikaPipesSolr6Test extends TikaPipesSolrTestBase {
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6ZkTest.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java
similarity index 96%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6ZkTest.java
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java
index 69b1daa..682d3df 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6ZkTest.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.solrtest;
+package org.apache.tika.pipes.solr.tests;
import static org.junit.Assume.assumeTrue;
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java
similarity index 96%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java
index 364e370..ae1064c 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.solrtest;
+package org.apache.tika.pipes.solr.tests;
public class TikaPipesSolr7Test extends TikaPipesSolrTestBase {
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7ZkTest.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java
similarity index 96%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7ZkTest.java
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java
index 719f84c..c641d53 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7ZkTest.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.solrtest;
+package org.apache.tika.pipes.solr.tests;
import static org.junit.Assume.assumeTrue;
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java
similarity index 96%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8Test.java
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java
index 63850f9..0d82f63 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8Test.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.solrtest;
+package org.apache.tika.pipes.solr.tests;
public class TikaPipesSolr8Test extends TikaPipesSolrTestBase {
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8ZkTest.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8ZkTest.java
similarity index 96%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8ZkTest.java
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8ZkTest.java
index 4a3ab13..7f160e4 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8ZkTest.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8ZkTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.solrtest;
+package org.apache.tika.pipes.solr.tests;
import static org.junit.Assume.assumeTrue;
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolrTestBase.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java
similarity index 97%
rename from tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolrTestBase.java
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java
index 93ed746..5083ff0 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolrTestBase.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolrTestBase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.solrtest;
+package org.apache.tika.pipes.solr.tests;
import java.io.File;
import java.io.InputStream;
@@ -35,7 +35,6 @@ import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
import org.testcontainers.utility.DockerImageName;
import org.apache.tika.cli.TikaCLI;
-import org.apache.tika.pipes.PipeIntegrationTests;
import org.apache.tika.pipes.emitter.solr.SolrEmitter;
public abstract class TikaPipesSolrTestBase {
@@ -108,12 +107,12 @@ public abstract class TikaPipesSolrTestBase {
throws Exception {
File tikaConfigFile = new File("target", "ta.xml");
File log4jPropFile = new File("target", "tmp-log4j2.xml");
- try (InputStream is = PipeIntegrationTests.class
+ try (InputStream is = this.getClass()
.getResourceAsStream("/pipes-fork-server-custom-log4j2.xml")) {
FileUtils.copyInputStreamToFile(is, log4jPropFile);
}
String tikaConfigTemplateXml;
- try (InputStream is = PipeIntegrationTests.class
+ try (InputStream is = this.getClass()
.getResourceAsStream("/tika-config-solr-urls.xml")) {
tikaConfigTemplateXml = IOUtils.toString(is, StandardCharsets.UTF_8);
}
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/log4j2.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/log4j2.xml
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/pipes-fork-server-custom-log4j2.xml
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-async-log4j2.properties b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-async-log4j2.properties
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-async-log4j2.properties
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-async-log4j2.properties
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-solr-urls.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
similarity index 100%
rename from tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-solr-urls.xml
rename to tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index 308ab65..fb762c7 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -35,7 +35,6 @@
<module>tika-fetchers</module>
<module>tika-emitters</module>
<module>tika-pipes-iterators</module>
- <module>tika-pipes-integration-tests</module>
</modules>
<build>