JAMES-2584 Filter Cassandra related integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d6be7a14 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d6be7a14 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d6be7a14 Branch: refs/heads/master Commit: d6be7a14f0f0406a193c4ea0efa03a17280d598e Parents: ec8efc6 Author: Antoine Duprat <adup...@linagora.com> Authored: Tue Nov 6 15:01:41 2018 +0100 Committer: Antoine Duprat <adup...@linagora.com> Committed: Fri Nov 9 08:49:10 2018 +0100 ---------------------------------------------------------------------- .../cassandra-jmap-integration-testing/pom.xml | 2 +- .../james/jmap/methods/integration/GetMessageListMethodTest.java | 3 +++ .../james/jmap/methods/integration/SetMailboxesMethodTest.java | 3 +++ .../memory-jmap-integration-testing/pom.xml | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d6be7a14/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index b19157b..ebd4966 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -227,7 +227,7 @@ <reuseForks>true</reuseForks> <!-- Fail tests longer than 2 hours, prevent form random locking tests --> <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds> - <groups combine.self="override">org.apache.james.jmap.categories.BasicFeature,org.apache.james.jmap.categories.EnableCucumber</groups> + <groups combine.self="override">org.apache.james.jmap.categories.CassandraAndElasticSearchOnly,org.apache.james.jmap.categories.BasicFeature,org.apache.james.jmap.categories.EnableCucumber</groups> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/d6be7a14/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java index 525a618..83747b6 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java @@ -51,6 +51,7 @@ import javax.mail.Flags; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.categories.BasicFeature; +import org.apache.james.jmap.categories.CassandraAndElasticSearchCategory; import org.apache.james.jmap.model.Number; import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.MessageManager; @@ -1131,6 +1132,7 @@ public abstract class GetMessageListMethodTest { } @Test + @Category(CassandraAndElasticSearchCategory.class) public void getMessageListShouldExcludeMessagesWhenAttachmentFilterDoesntMatch() throws Exception { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox"); byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf"); @@ -1159,6 +1161,7 @@ public abstract class GetMessageListMethodTest { } @Test + @Category(CassandraAndElasticSearchCategory.class) public void getMessageListShouldIncludeMessagesWhenAttachmentFilterMatches() throws Exception { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox"); byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf"); http://git-wip-us.apache.org/repos/asf/james-project/blob/d6be7a14/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index 6ea2ce6..25af3c4 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -49,6 +49,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.categories.BasicFeature; +import org.apache.james.jmap.categories.CassandraAndElasticSearchCategory; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.model.MailboxACL; @@ -117,6 +118,7 @@ public abstract class SetMailboxesMethodTest { } @Test + @Category(CassandraAndElasticSearchCategory.class) public void setMailboxesShouldNotCreateWhenOverLimitName() { String overLimitName = StringUtils.repeat("a", MAILBOX_NAME_LENGTH_64K); String requestBody = @@ -148,6 +150,7 @@ public abstract class SetMailboxesMethodTest { } @Test + @Category(CassandraAndElasticSearchCategory.class) public void setMailboxesShouldNotUpdateMailboxWhenOverLimitName() { String overLimitName = StringUtils.repeat("a", MAILBOX_NAME_LENGTH_64K); MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox"); http://git-wip-us.apache.org/repos/asf/james-project/blob/d6be7a14/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index ba7df5a..5a0dd8b 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -169,6 +169,7 @@ <configuration> <reuseForks>false</reuseForks> <forkCount>1C</forkCount> + <excludedGroups combine.self="override">org.apache.james.jmap.categories.CassandraAndElasticSearchOnly</excludedGroups> </configuration> </plugin> </plugins> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
