You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/08/23 10:25:10 UTC
[james-project] 17/26: JAMES-3771 JMAP integration tests: Elastic => OpenSearch rewords
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e88a3fd03a44f951c58fd25c20bf904b37f7bf4d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 11:34:35 2022 +0700
JAMES-3771 JMAP integration tests: Elastic => OpenSearch rewords
---
.../categories/CassandraAndOpenSearchCategory.java | 2 +-
.../DistributedThreadGetMethodTest.java | 12 +++++-----
.../jmap/rfc8621/contract/ThreadGetContract.scala | 4 ++--
.../rfc8621/memory/MemoryThreadGetMethodTest.java | 2 +-
...RabbitMQReindexingWithEventDeadLettersTest.java | 28 +++++++++++-----------
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
index 6ebf1787f0..1c494299d1 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
@@ -21,7 +21,7 @@ package org.apache.james.jmap.categories;
/**
* Category marker for Junit 4 conditional execution
- * Marks tests that should be run only on Cassandra & ElasticSearch implementation
+ * Marks tests that should be run only on Cassandra & OpenSearch implementation
*/
public interface CassandraAndOpenSearchCategory {
}
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java
index ec4d41534c..cc507c9e4c 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java
@@ -64,7 +64,7 @@ public class DistributedThreadGetMethodTest implements ThreadGetContract {
private ReactorOpenSearchClient client;
@RegisterExtension
- org.apache.james.backends.opensearch.DockerOpenSearchExtension elasticSearch = new org.apache.james.backends.opensearch.DockerOpenSearchExtension();
+ org.apache.james.backends.opensearch.DockerOpenSearchExtension openSearch = new org.apache.james.backends.opensearch.DockerOpenSearchExtension();
@RegisterExtension
JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
@@ -93,17 +93,17 @@ public class DistributedThreadGetMethodTest implements ThreadGetContract {
@Override
public void awaitMessageCount(List<MailboxId> mailboxIds, SearchQuery query, long messageCount) {
- awaitForElasticSearch(queryConverter.from(mailboxIds, query), messageCount);
+ awaitForOpenSearch(queryConverter.from(mailboxIds, query), messageCount);
}
@Override
- public void initElasticSearchClient() {
+ public void initOpenSearchClient() {
client = MailboxIndexCreationUtil.prepareDefaultClient(
- elasticSearch.getDockerOpenSearch().clientProvider().get(),
- elasticSearch.getDockerOpenSearch().configuration());
+ openSearch.getDockerOpenSearch().clientProvider().get(),
+ openSearch.getDockerOpenSearch().configuration());
}
- private void awaitForElasticSearch(QueryBuilder query, long totalHits) {
+ private void awaitForOpenSearch(QueryBuilder query, long totalHits) {
CALMLY_AWAIT.atMost(Durations.TEN_SECONDS)
.untilAsserted(() -> assertThat(client.search(
new SearchRequest(MailboxOpenSearchConstants.DEFAULT_MAILBOX_INDEX.getValue())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/ThreadGetContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/ThreadGetContract.scala
index c31b072568..aca417bcb3 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/ThreadGetContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/ThreadGetContract.scala
@@ -44,11 +44,11 @@ trait ThreadGetContract {
protected def awaitMessageCount(mailboxIds: util.List[MailboxId], query: SearchQuery, messageCount: Long): Unit
- protected def initElasticSearchClient(): Unit
+ protected def initOpenSearchClient(): Unit
@BeforeEach
def setUp(server: GuiceJamesServer): Unit = {
- initElasticSearchClient()
+ initOpenSearchClient()
server.getProbe(classOf[DataProbeImpl])
.fluent
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryThreadGetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryThreadGetMethodTest.java
index b21f2b2274..c0d41f6635 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryThreadGetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryThreadGetMethodTest.java
@@ -51,7 +51,7 @@ public class MemoryThreadGetMethodTest implements ThreadGetContract {
}
@Override
- public void initElasticSearchClient() {
+ public void initOpenSearchClient() {
}
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
index 288fd3ab8c..7be41f7073 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
@@ -68,7 +68,7 @@ import io.restassured.specification.RequestSpecification;
@Tag(BasicFeature.TAG)
class RabbitMQReindexingWithEventDeadLettersTest {
- private static final String ELASTICSEARCH_LISTENER_GROUP = "org.apache.james.mailbox.opensearch.events.ElasticSearchListeningMessageSearchIndex$ElasticSearchListeningMessageSearchIndexGroup";
+ private static final String OPENSEARCH_LISTENER_GROUP = "org.apache.james.mailbox.opensearch.events.OpenSearchListeningMessageSearchIndex$OpenSearchListeningMessageSearchIndexGroup";
private static final ConditionFactory CALMLY_AWAIT = Awaitility
.with().pollInterval(Duration.ofMillis(100))
@@ -76,7 +76,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
.atMost(Duration.ofMinutes(5))
.await();
- private static final DockerOpenSearchExtension dockerElasticSearch =
+ private static final DockerOpenSearchExtension dockerOpenSearch =
new DockerOpenSearchExtension().withRequestTimeout(java.time.Duration.ofSeconds(5));
@RegisterExtension
@@ -91,7 +91,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.openSearch())
.build())
- .extension(dockerElasticSearch)
+ .extension(dockerOpenSearch)
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
@@ -125,35 +125,35 @@ class RabbitMQReindexingWithEventDeadLettersTest {
aliceAccessToken = authenticateJamesUser(LocalHostURIBuilder.baseUri(jmapPort), ALICE, ALICE_PASSWORD);
- dockerElasticSearch.getDockerES().pause();
+ dockerOpenSearch.getDockerES().pause();
Thread.sleep(Duration.ofSeconds(2).toMillis()); // Docker pause is asynchronous and we found no way to poll for it
}
@Disabled("JAMES-3011 It's already fails for a long time, but CI didn't detect this when it's not marked as BasicFeature")
@Test
- void indexationShouldBeFailingWhenElasticSearchContainerIsPaused() throws Exception {
+ void indexationShouldBeFailingWhenOpenSearchContainerIsPaused() throws Exception {
aliceSavesADraft();
- CALMLY_AWAIT.until(() -> listElasticSearchFailedEvents().size() == 1);
+ CALMLY_AWAIT.until(() -> listOpenSearchFailedEvents().size() == 1);
- unpauseElasticSearch();
+ unpauseOpenSearch();
assertThat(listMessageIdsForAccount(aliceAccessToken)).isEmpty();
}
@Test
void redeliverShouldReIndexFailedMessagesAndCleanEventDeadLetter() throws Exception {
aliceSavesADraft();
- CALMLY_AWAIT.until(() -> listElasticSearchFailedEvents().size() == 1);
+ CALMLY_AWAIT.until(() -> listOpenSearchFailedEvents().size() == 1);
- unpauseElasticSearch();
+ unpauseOpenSearch();
redeliverAllFailedEvents();
CALMLY_AWAIT.until(() -> listMessageIdsForAccount(aliceAccessToken).size() == 1);
- assertThat(listElasticSearchFailedEvents()).isEmpty();
+ assertThat(listOpenSearchFailedEvents()).isEmpty();
}
- private void unpauseElasticSearch() throws Exception {
- dockerElasticSearch.getDockerES().unpause();
+ private void unpauseOpenSearch() throws Exception {
+ dockerOpenSearch.getDockerES().unpause();
Thread.sleep(Duration.ofSeconds(2).toMillis()); // Docker unpause is asynchronous and we found no way to poll for it
}
@@ -181,9 +181,9 @@ class RabbitMQReindexingWithEventDeadLettersTest {
.post("/jmap");
}
- private List<String> listElasticSearchFailedEvents() {
+ private List<String> listOpenSearchFailedEvents() {
return webAdminApi.with()
- .get("/events/deadLetter/groups/" + ELASTICSEARCH_LISTENER_GROUP)
+ .get("/events/deadLetter/groups/" + OPENSEARCH_LISTENER_GROUP)
.andReturn()
.body()
.jsonPath()
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org