You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/03/14 02:04:59 UTC
[james-project] 07/07: JAMES-2665 Re-enable vault integration test
about mailbox deletion
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 8f8c4c855512f3a4d5bea186a487c31bca676f62
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Mar 12 11:04:32 2019 +0700
JAMES-2665 Re-enable vault integration test about mailbox deletion
---
.../jmap/cassandra/CassandraDeletedMessageVaultTest.java | 13 -------------
.../jmap/methods/integration/DeletedMessagesVaultTest.java | 2 --
.../james/jmap/memory/MemoryDeletedMessagesVaultTest.java | 13 -------------
.../jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java | 14 --------------
4 files changed, 42 deletions(-)
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java
index 38d20d6..1f331c4 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.categories.BasicFeature;
import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
import org.apache.james.modules.mailbox.PreDeletionHookConfiguration;
@@ -34,12 +33,8 @@ import org.apache.james.vault.MailRepositoryDeletedMessageVault;
import org.apache.james.webadmin.WebAdminConfiguration;
import org.junit.ClassRule;
import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.jupiter.api.Disabled;
public class CassandraDeletedMessageVaultTest extends DeletedMessagesVaultTest {
-
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
@@ -61,12 +56,4 @@ public class CassandraDeletedMessageVaultTest extends DeletedMessagesVaultTest {
protected void awaitSearchUpToDate() {
rule.await();
}
-
- @Disabled("MAILBOX-379 PreDeletionHook are not yet triggered upon mailbox deletion")
- @Category(BasicFeature.class)
- @Override
- @Test
- public void vaultEndpointShouldRestoreImapDeletedMailbox() {
-
- }
}
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 7ffaf6e..2b32dde 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
@@ -59,7 +59,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.jupiter.api.Disabled;
import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
import com.google.common.base.Strings;
@@ -181,7 +180,6 @@ public abstract class DeletedMessagesVaultTest {
.body(ARGUMENTS + ".list.subject", hasItem(SUBJECT));
}
- @Disabled("MAILBOX-379 PreDeletionHook are not yet triggered upon mailbox deletion")
@Category(BasicFeature.class)
@Test
public void vaultEndpointShouldRestoreImapDeletedMailbox() throws Exception {
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java
index c3c2516..d83717d 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.james.GuiceJamesServer;
import org.apache.james.MemoryJmapTestRule;
-import org.apache.james.jmap.categories.BasicFeature;
import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
import org.apache.james.modules.mailbox.PreDeletionHookConfiguration;
@@ -32,12 +31,8 @@ import org.apache.james.vault.DeletedMessageVaultHook;
import org.apache.james.vault.MailRepositoryDeletedMessageVault;
import org.apache.james.webadmin.WebAdminConfiguration;
import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.jupiter.api.Disabled;
public class MemoryDeletedMessagesVaultTest extends DeletedMessagesVaultTest {
-
@Rule
public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
@@ -56,12 +51,4 @@ public class MemoryDeletedMessagesVaultTest extends DeletedMessagesVaultTest {
protected void awaitSearchUpToDate() {
}
-
- @Disabled("MAILBOX-379 PreDeletionHook are not yet triggered upon mailbox deletion")
- @Category(BasicFeature.class)
- @Override
- @Test
- public void vaultEndpointShouldRestoreImapDeletedMailbox() {
-
- }
}
diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java
index 9e5d706..840f45c 100644
--- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java
+++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.apache.james.CassandraRabbitMQSwiftJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.categories.BasicFeature;
import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
import org.apache.james.modules.mailbox.PreDeletionHookConfiguration;
@@ -34,12 +33,8 @@ import org.apache.james.vault.MailRepositoryDeletedMessageVault;
import org.apache.james.webadmin.WebAdminConfiguration;
import org.junit.ClassRule;
import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.jupiter.api.Disabled;
public class RabbitMQDeletedMessagesVaultTest extends DeletedMessagesVaultTest {
-
@ClassRule
public static DockerCassandraRule cassandra = new DockerCassandraRule();
@@ -61,13 +56,4 @@ public class RabbitMQDeletedMessagesVaultTest extends DeletedMessagesVaultTest {
protected void awaitSearchUpToDate() {
rule.await();
}
-
- @Disabled("MAILBOX-379 PreDeletionHook are not yet triggered upon mailbox deletion")
- @Category(BasicFeature.class)
- @Override
- @Test
- public void vaultEndpointShouldRestoreImapDeletedMailbox() {
-
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org