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:02 UTC
[james-project] 09/26: JAMES-3771 JMAP integration tests: Elastic -> OpenSearch
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 4a54cc67b1efdcf210ff4bceb5b11a9a35f68fef
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 10:36:27 2022 +0700
JAMES-3771 JMAP integration tests: Elastic -> OpenSearch
---
...ticSearchCategory.java => CassandraAndOpenSearchCategory.java} | 2 +-
.../jmap/draft/methods/integration/GetMessageListMethodTest.java | 8 ++++----
.../jmap/draft/methods/integration/SetMailboxesMethodTest.java | 6 +++---
...asticSearchSingleton.java => CucumberOpenSearchSingleton.java} | 2 +-
.../james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndElasticSearchCategory.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
similarity index 94%
rename from server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndElasticSearchCategory.java
rename to server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
index b264eebac3..6ebf1787f0 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndElasticSearchCategory.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/categories/CassandraAndOpenSearchCategory.java
@@ -23,5 +23,5 @@ package org.apache.james.jmap.categories;
* Category marker for Junit 4 conditional execution
* Marks tests that should be run only on Cassandra & ElasticSearch implementation
*/
-public interface CassandraAndElasticSearchCategory {
+public interface CassandraAndOpenSearchCategory {
}
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
index bcdb08061e..f8345c4ba1 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java
@@ -63,7 +63,7 @@ import javax.mail.Flags;
import org.apache.james.GuiceJamesServer;
import org.apache.james.core.Username;
import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.categories.CassandraAndElasticSearchCategory;
+import org.apache.james.jmap.categories.CassandraAndOpenSearchCategory;
import org.apache.james.jmap.draft.JmapGuiceProbe;
import org.apache.james.jmap.draft.model.Number;
import org.apache.james.junit.categories.BasicFeature;
@@ -1219,7 +1219,7 @@ public abstract class GetMessageListMethodTest {
}
@Test
- @Category(CassandraAndElasticSearchCategory.class)
+ @Category(CassandraAndOpenSearchCategory.class)
public void getMessageListShouldIncludeMessagesWhenTextFilterMatchesBodyWithStemming() throws Exception {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(ALICE.asString(), ALICE_MAILBOX,
@@ -1391,7 +1391,7 @@ public abstract class GetMessageListMethodTest {
}
@Test
- @Category(CassandraAndElasticSearchCategory.class)
+ @Category(CassandraAndOpenSearchCategory.class)
public void getMessageListShouldExcludeMessagesWhenAttachmentFilterDoesntMatch() throws Exception {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
@@ -1420,7 +1420,7 @@ public abstract class GetMessageListMethodTest {
}
@Test
- @Category(CassandraAndElasticSearchCategory.class)
+ @Category(CassandraAndOpenSearchCategory.class)
public void getMessageListShouldIncludeMessagesWhenAttachmentFilterMatches() throws Exception {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), "mailbox");
byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
index 928024eae4..2cee94fe95 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
@@ -49,7 +49,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.james.GuiceJamesServer;
import org.apache.james.core.Username;
import org.apache.james.jmap.AccessToken;
-import org.apache.james.jmap.categories.CassandraAndElasticSearchCategory;
+import org.apache.james.jmap.categories.CassandraAndOpenSearchCategory;
import org.apache.james.jmap.draft.JmapGuiceProbe;
import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.mailbox.DefaultMailboxes;
@@ -124,7 +124,7 @@ public abstract class SetMailboxesMethodTest {
}
@Test
- @Category(CassandraAndElasticSearchCategory.class)
+ @Category(CassandraAndOpenSearchCategory.class)
public void setMailboxesShouldNotCreateWhenOverLimitName() {
String overLimitName = StringUtils.repeat("a", MAILBOX_NAME_LENGTH_64K);
String requestBody =
@@ -156,7 +156,7 @@ public abstract class SetMailboxesMethodTest {
}
@Test
- @Category(CassandraAndElasticSearchCategory.class)
+ @Category(CassandraAndOpenSearchCategory.class)
public void setMailboxesShouldNotUpdateMailboxWhenOverLimitName() {
String overLimitName = StringUtils.repeat("a", MAILBOX_NAME_LENGTH_64K);
MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username.asString(), "myBox");
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberElasticSearchSingleton.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java
similarity index 97%
rename from server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberElasticSearchSingleton.java
rename to server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java
index d1bfed03cd..8c2bfc4fc2 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberElasticSearchSingleton.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java
@@ -20,7 +20,7 @@ package org.apache.james.jmap.rabbitmq.cucumber.awss3;
import org.apache.james.DockerElasticSearchRule;
-class CucumberElasticSearchSingleton {
+class CucumberOpenSearchSingleton {
static final DockerElasticSearchRule elasticSearch = new DockerElasticSearchRule();
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
index 99b4058831..6a65ffe3bd 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
@@ -54,7 +54,7 @@ public class RabbitMQAwsS3Stepdefs {
private final ImapStepdefs imapStepdefs;
private final TemporaryFolder temporaryFolder = new TemporaryFolder();
private final DockerCassandraRule cassandraServer = CucumberCassandraSingleton.cassandraServer;
- private final DockerElasticSearchRule elasticSearch = CucumberElasticSearchSingleton.elasticSearch;
+ private final DockerElasticSearchRule elasticSearch = CucumberOpenSearchSingleton.elasticSearch;
private final DockerRabbitMQRule rabbitMQServer = CucumberRabbitMQSingleton.rabbitMQServer;
private final DockerAwsS3TestRule awsS3Server = CucumberAwsS3Singleton.awsS3Server;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org