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/11/30 20:49:05 UTC
[tika] branch main updated: TIKA-3603 -- upgrade testcontainers and do other cleanup in opensearch integration unit tests
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 c225dad TIKA-3603 -- upgrade testcontainers and do other cleanup in opensearch integration unit tests
c225dad is described below
commit c225dad2f656d38bd7a17cda2bb8163a6cba251f
Author: tballison <ta...@apache.org>
AuthorDate: Tue Nov 30 15:48:52 2021 -0500
TIKA-3603 -- upgrade testcontainers and do other cleanup in opensearch integration unit tests
---
.../apache/tika/pipes/es/tests/TikaPipesES7Test.java | 9 ++++-----
.../opensearch/tests/TikaPipesOpenSearchTest.java | 6 ++++--
.../tests/TikaPipesXSearchBase.java} | 18 +++++++++---------
.../tests/XSearchTestClient.java} | 10 +++++-----
tika-parent/pom.xml | 2 +-
5 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/es/tests/TikaPipesES7Test.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/es/tests/TikaPipesES7Test.java
index e728380..0ebb039 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/es/tests/TikaPipesES7Test.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/es/tests/TikaPipesES7Test.java
@@ -25,8 +25,7 @@ import org.junit.Ignore;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.utility.DockerImageName;
-import org.apache.tika.pipes.opensearch.tests.TikaPipesOpenSearchBase;
-import org.apache.tika.pipes.opensearch.tests.TikaPipesOpenSearchTest;
+import org.apache.tika.pipes.xsearch.tests.TikaPipesXSearchBase;
/**
* This is used only for devtesting to figure out when the OpenSearch
@@ -34,7 +33,7 @@ import org.apache.tika.pipes.opensearch.tests.TikaPipesOpenSearchTest;
* > 7.10.x in our unit tests because those versions are not ASL 2.0
*/
@Ignore
-public class TikaPipesES7Test extends TikaPipesOpenSearchBase {
+public class TikaPipesES7Test extends TikaPipesXSearchBase {
// versions > 7.10.x are no longer ASL 2.0. We should not
// test with non-ASL 2.0 dependencies
@@ -42,7 +41,7 @@ public class TikaPipesES7Test extends TikaPipesOpenSearchBase {
".co/elasticsearch/elasticsearch:7.10.2";
@ClassRule
- public static GenericContainer<?> OPEN_SEARCH_CONTAINER =
+ public static GenericContainer<?> ELASTIC_SEARCH_CONTAINER =
new GenericContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
.withExposedPorts(9200)
.withStartupTimeout(Duration.of(180, ChronoUnit.SECONDS))
@@ -50,6 +49,6 @@ public class TikaPipesES7Test extends TikaPipesOpenSearchBase {
@BeforeClass
public static void setupTest() throws Exception {
- setupOpenSearch(OPEN_SEARCH_CONTAINER, "http://");
+ setupXSearch(ELASTIC_SEARCH_CONTAINER, "http://");
}
}
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
index 664aa94..c0b089f 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
@@ -24,7 +24,9 @@ import org.junit.ClassRule;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.utility.DockerImageName;
-public class TikaPipesOpenSearchTest extends TikaPipesOpenSearchBase {
+import org.apache.tika.pipes.xsearch.tests.TikaPipesXSearchBase;
+
+public class TikaPipesOpenSearchTest extends TikaPipesXSearchBase {
private static final String DOCKER_IMAGE_NAME = "opensearchproject/opensearch:1.2.0";
@@ -38,6 +40,6 @@ public class TikaPipesOpenSearchTest extends TikaPipesOpenSearchBase {
@BeforeClass
public static void setupTest() throws Exception {
- setupOpenSearch(OPEN_SEARCH_CONTAINER, "https://");
+ setupXSearch(OPEN_SEARCH_CONTAINER, "https://");
}
}
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchBase.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java
similarity index 95%
rename from tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchBase.java
rename to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.java
index 6f0c2d7..92cddbe 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchBase.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/TikaPipesXSearchBase.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.tests;
+package org.apache.tika.pipes.xsearch.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -43,7 +43,7 @@ import org.apache.tika.pipes.HandlerConfig;
import org.apache.tika.pipes.emitter.opensearch.JsonResponse;
import org.apache.tika.pipes.emitter.opensearch.OpenSearchEmitter;
-public class TikaPipesOpenSearchBase {
+public abstract class TikaPipesXSearchBase {
private static final String TEST_INDEX = "tika-pipes-index";
private static final File TEST_FILE_FOLDER = new File("target", "test-files");
@@ -52,7 +52,7 @@ public class TikaPipesOpenSearchBase {
private static int OPEN_SEARCH_PORT;
//this includes only the base, not the collection, e.g. https://localhost:49213
private static String OPEN_SEARCH_ENDPOINT_BASE;
- private static OpenSearchTestClient client;
+ private static XSearchTestClient client;
@After
@@ -217,7 +217,7 @@ public class TikaPipesOpenSearchBase {
private void sendMappings(String endpoint, String index, String mappingsFile) throws Exception {
//create the collection with mappings
- String mappings = IOUtils.toString(TikaPipesOpenSearchBase.class.getResourceAsStream(
+ String mappings = IOUtils.toString(TikaPipesXSearchBase.class.getResourceAsStream(
"/opensearch/" + mappingsFile), StandardCharsets.UTF_8);
int status = -1;
int tries = 0;
@@ -244,12 +244,12 @@ public class TikaPipesOpenSearchBase {
File tikaConfigFile = new File("target", "ta-opensearch.xml");
File log4jPropFile = new File("target", "tmp-log4j2.xml");
- try (InputStream is = TikaPipesOpenSearchBase.class
+ try (InputStream is = TikaPipesXSearchBase.class
.getResourceAsStream("/pipes-fork-server-custom-log4j2.xml")) {
FileUtils.copyInputStreamToFile(is, log4jPropFile);
}
String tikaConfigTemplateXml;
- try (InputStream is = TikaPipesOpenSearchBase.class
+ try (InputStream is = TikaPipesXSearchBase.class
.getResourceAsStream("/opensearch/tika-config-opensearch.xml")) {
tikaConfigTemplateXml = IOUtils.toString(is, StandardCharsets.UTF_8);
}
@@ -284,7 +284,7 @@ public class TikaPipesOpenSearchBase {
}
- public static void setupOpenSearch(GenericContainer<?> openSearchContainer, String protocol) throws Exception {
+ public static void setupXSearch(GenericContainer<?> openSearchContainer, String protocol) throws Exception {
OPEN_SEARCH_HOST = openSearchContainer.getHost();
OPEN_SEARCH_PORT = openSearchContainer.getMappedPort(9200);
OPEN_SEARCH_ENDPOINT_BASE = protocol + OPEN_SEARCH_HOST + ":" + OPEN_SEARCH_PORT + "/";
@@ -292,7 +292,7 @@ public class TikaPipesOpenSearchBase {
httpClientFactory.setUserName("admin");
httpClientFactory.setPassword("admin");
//attachment strategy is not used here...TODO clean this up
- client = new OpenSearchTestClient(OPEN_SEARCH_ENDPOINT_BASE,
+ client = new XSearchTestClient(OPEN_SEARCH_ENDPOINT_BASE,
httpClientFactory.build(),
OpenSearchEmitter.AttachmentStrategy.SEPARATE_DOCUMENTS,
OpenSearchEmitter.DEFAULT_EMBEDDED_FILE_FIELD_NAME);
@@ -305,7 +305,7 @@ public class TikaPipesOpenSearchBase {
"<html><body>" + bodyContent + "</body></html>", StandardCharsets.UTF_8);
}
File testDocuments =
- Paths.get(TikaPipesOpenSearchBase.class.getResource("/test-documents").toURI()).toFile();
+ Paths.get(TikaPipesXSearchBase.class.getResource("/test-documents").toURI()).toFile();
for (File f : testDocuments.listFiles()) {
Path targ = TEST_FILE_FOLDER.toPath().resolve(f.getName());
Files.copy(f.toPath(), targ);
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/OpenSearchTestClient.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/XSearchTestClient.java
similarity index 94%
rename from tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/OpenSearchTestClient.java
rename to tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/XSearchTestClient.java
index 5fa09d0..ec8191f 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/OpenSearchTestClient.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/xsearch/tests/XSearchTestClient.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.tests;
+package org.apache.tika.pipes.xsearch.tests;
import java.io.BufferedReader;
import java.io.IOException;
@@ -41,11 +41,11 @@ import org.apache.tika.pipes.emitter.opensearch.OpenSearchEmitter;
* This expands on the OpenSearchClient for testing purposes.
* This has more functionality than is needed for sending docs to OpenSearch
*/
-public class OpenSearchTestClient extends OpenSearchClient {
+public class XSearchTestClient extends OpenSearchClient {
- protected OpenSearchTestClient(String openSearchUrl, HttpClient httpClient,
- OpenSearchEmitter.AttachmentStrategy attachmentStrategy,
- String embeddedFileFieldName) {
+ protected XSearchTestClient(String openSearchUrl, HttpClient httpClient,
+ OpenSearchEmitter.AttachmentStrategy attachmentStrategy,
+ String embeddedFileFieldName) {
super(openSearchUrl, httpClient, attachmentStrategy, embeddedFileFieldName);
}
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index ca04560..08d98c8 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -364,7 +364,7 @@
<spring.version>5.3.9</spring.version>
<sqlite.version>3.36.0.1</sqlite.version>
<tagsoup.version>1.2.1</tagsoup.version>
- <test.containers.version>1.15.2</test.containers.version>
+ <test.containers.version>1.16.2</test.containers.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
<tukaani.version>1.9</tukaani.version>
<twelvemonkeys.version>3.7.0</twelvemonkeys.version>