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 7fc5ee200b6fe62b3f2e9769a19f9cfcd8dcfc48
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Tue Mar 5 15:04:24 2019 +0700
JAMES-2665 Basic first integration test for RabbitMQ and the vault
Exercise it on Cassandra mail repositories
---
.../methods/integration/DeletedMessagesVaultTest.java | 2 +-
.../rabbitmq/RabbitMQDeletedMessagesVaultTest.java} | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
index ba529c7..9e035ab 100644
---
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
+++
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
@@ -110,7 +110,7 @@ public abstract class DeletedMessagesVaultTest {
@Category(BasicFeature.class)
@Test
- public void shouldSendANoticeWhenThresholdExceeded() {
+ public void postShouldRestoreJmapDeletedEmail() {
bartSendMessageToHomer();
WAIT_TWO_MINUTES.until(() ->
listMessageIdsForAccount(homerAccessToken).size() == 1);
diff --git
a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryFileRepositoryDeletedMessagesVaultTest.java
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java
similarity index 79%
rename from
server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryFileRepositoryDeletedMessagesVaultTest.java
rename to
server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java
index 11f8373..6382811 100644
---
a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryFileRepositoryDeletedMessagesVaultTest.java
+++
b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java
@@ -17,12 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.memory;
+package org.apache.james.jmap.rabbitmq;
import java.io.IOException;
+import org.apache.james.CassandraRabbitMQSwiftJmapTestRule;
+import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
import org.apache.james.modules.mailbox.PreDeletionHookConfiguration;
@@ -30,21 +31,26 @@ import
org.apache.james.modules.mailbox.PreDeletionHooksConfiguration;
import org.apache.james.vault.DeletedMessageVaultHook;
import org.apache.james.vault.MailRepositoryDeletedMessageVault;
import org.apache.james.webadmin.WebAdminConfiguration;
+import org.junit.ClassRule;
import org.junit.Rule;
-public class MemoryFileRepositoryDeletedMessagesVaultTest extends
DeletedMessagesVaultTest {
+public class RabbitMQDeletedMessagesVaultTest extends DeletedMessagesVaultTest
{
+
+ @ClassRule
+ public static DockerCassandraRule cassandra = new DockerCassandraRule();
@Rule
- public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
+ public CassandraRabbitMQSwiftJmapTestRule rule =
CassandraRabbitMQSwiftJmapTestRule.defaultTestRule();
@Override
protected GuiceJamesServer createJmapServer() throws IOException {
- return memoryJmap.jmapServer(
+ return rule.jmapServer(cassandra.getModule(),
binder -> binder.bind(PreDeletionHooksConfiguration.class)
.toInstance(PreDeletionHooksConfiguration.forHooks(
PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))),
binder ->
binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION),
binder ->
binder.bind(MailRepositoryDeletedMessageVault.Configuration.class)
- .toInstance(new
MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("file://var/deletedMessages/user"))));
+ .toInstance(new
MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("cassandra://var/deletedMessages/user"))));
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
