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 daa40dc4ede28fd89dad13dcd6515b872ea9a9e2 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Wed Mar 6 18:13:40 2019 +0700 JAMES-2665 Introduce await in Vault integration tests --- .../james/jmap/cassandra/CassandraDeletedMessageVaultTest.java | 5 +++++ .../james/jmap/methods/integration/DeletedMessagesVaultTest.java | 7 ++++--- .../apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java | 5 +++++ .../james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java | 5 +++++ 4 files changed, 19 insertions(+), 3 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 8c10c51..38d20d6 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 @@ -57,6 +57,11 @@ public class CassandraDeletedMessageVaultTest extends DeletedMessagesVaultTest { .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("cassandra://var/deletedMessages/user")))); } + @Override + protected void awaitSearchUpToDate() { + rule.await(); + } + @Disabled("MAILBOX-379 PreDeletionHook are not yet triggered upon mailbox deletion") @Category(BasicFeature.class) @Override 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 bfbba3f..55476f0 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 @@ -80,6 +80,8 @@ public abstract class DeletedMessagesVaultTest { protected abstract GuiceJamesServer createJmapServer() throws IOException; + protected abstract void awaitSearchUpToDate(); + @Rule public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); @@ -282,7 +284,7 @@ public abstract class DeletedMessagesVaultTest { WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 1); restoreAllMessagesOfHomer(); - Thread.sleep(Duration.FIVE_SECONDS.getValueInMS()); + awaitSearchUpToDate(); // No additional had been restored as the vault is empty assertThat(listMessageIdsForAccount(homerAccessToken).size()) @@ -304,8 +306,7 @@ public abstract class DeletedMessagesVaultTest { WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 0); restoreMessagesFor(BART); - - Thread.sleep(Duration.FIVE_SECONDS.getValueInMS()); + awaitSearchUpToDate(); // No additional had been restored for Bart as the vault is empty assertThat(listMessageIdsForAccount(bartAccessToken).size()) 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 956d362..c3c2516 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 @@ -52,6 +52,11 @@ public class MemoryDeletedMessagesVaultTest extends DeletedMessagesVaultTest { .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("memory://var/deletedMessages/user")))); } + @Override + protected void awaitSearchUpToDate() { + + } + @Disabled("MAILBOX-379 PreDeletionHook are not yet triggered upon mailbox deletion") @Category(BasicFeature.class) @Override 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 f60b8d9..9e5d706 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 @@ -57,6 +57,11 @@ public class RabbitMQDeletedMessagesVaultTest extends DeletedMessagesVaultTest { .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("cassandra://var/deletedMessages/user")))); } + @Override + protected void awaitSearchUpToDate() { + rule.await(); + } + @Disabled("MAILBOX-379 PreDeletionHook are not yet triggered upon mailbox deletion") @Category(BasicFeature.class) @Override --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org