This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 218cd15c663a4cb8ca5739f7664fe6a46596c59a Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jul 11 16:20:13 2019 +0200 JAMES-2812 Integration test for retention Relax the retention delay in integration test --- mailbox/pom.xml | 1 + .../integration/DeletedMessagesVaultTest.java | 15 +++++++-------- .../RabbitMQBlobStoreDeletedMessagesVaultTest.java | 20 -------------------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/mailbox/pom.xml b/mailbox/pom.xml index ce5ecca..e107038 100644 --- a/mailbox/pom.xml +++ b/mailbox/pom.xml @@ -52,6 +52,7 @@ <module>memory</module> <module>plugin/deleted-messages-vault</module> + <module>plugin/deleted-messages-vault-cassandra</module> <module>plugin/quota-mailing</module> <module>plugin/quota-mailing-cassandra</module> 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 62e52ee..2f03a4e 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 @@ -47,8 +47,7 @@ import static org.hamcrest.Matchers.hasItem; import java.io.FileInputStream; import java.io.IOException; import java.time.Clock; -import java.time.Instant; -import java.time.temporal.ChronoUnit; +import java.time.ZonedDateTime; import java.util.List; import org.apache.james.GuiceJamesServer; @@ -91,8 +90,8 @@ import io.restassured.parsing.Parser; import io.restassured.specification.RequestSpecification; public abstract class DeletedMessagesVaultTest { - private static final Instant NOW = Instant.now(); - private static final Instant ONE_DAY_AFTER_ONE_YEAR_EXPIRATION = NOW.plus(366, ChronoUnit.DAYS); + private static final ZonedDateTime NOW = ZonedDateTime.now(); + private static final ZonedDateTime TWO_MONTH_AFTER_ONE_YEAR_EXPIRATION = NOW.plusYears(1).plusMonths(2); private static final String FIRST_SUBJECT = "first subject"; private static final String SECOND_SUBJECT = "second subject"; private static final String HOMER = "homer@" + DOMAIN; @@ -127,7 +126,7 @@ public abstract class DeletedMessagesVaultTest { @Before public void setup() throws Throwable { - clock = new UpdatableTickingClock(NOW); + clock = new UpdatableTickingClock(NOW.toInstant()); fileSystem = new FileSystemImpl(new JamesServerResourceLoader(tempFolder.getRoot().getPath())); jmapServer = createJmapServer(fileSystem, clock); jmapServer.start(); @@ -606,7 +605,7 @@ public abstract class DeletedMessagesVaultTest { homerDeletesMessages(listMessageIdsForAccount(homerAccessToken)); WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 0); - clock.setInstant(ONE_DAY_AFTER_ONE_YEAR_EXPIRATION); + clock.setInstant(TWO_MONTH_AFTER_ONE_YEAR_EXPIRATION.toInstant()); purgeVault(webAdminApi); String fileLocation = exportAndGetFileLocationFromLastMail(EXPORT_ALL_HOMER_MESSAGES_TO_BART, bartAccessToken); @@ -628,7 +627,7 @@ public abstract class DeletedMessagesVaultTest { String messageIdOfNotExpiredMessage = listMessageIdsForAccount(homerAccessToken).get(0); - clock.setInstant(ONE_DAY_AFTER_ONE_YEAR_EXPIRATION); + clock.setInstant(TWO_MONTH_AFTER_ONE_YEAR_EXPIRATION.toInstant()); homerDeletesMessages(listMessageIdsForAccount(homerAccessToken)); WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 0); @@ -667,7 +666,7 @@ public abstract class DeletedMessagesVaultTest { homerDeletesMessages(listMessageIdsForAccount(homerAccessToken)); WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 0); - clock.setInstant(ONE_DAY_AFTER_ONE_YEAR_EXPIRATION); + clock.setInstant(TWO_MONTH_AFTER_ONE_YEAR_EXPIRATION.toInstant()); purgeVault(webAdminApi); assertThat(listMessageIdsForAccount(homerAccessToken)) diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java index 3e20900..bf9ca6f 100644 --- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java @@ -58,26 +58,6 @@ public class RabbitMQBlobStoreDeletedMessagesVaultTest extends DeletedMessagesVa @Ignore("Will be implemented latter") @Test - public void vaultPurgeShouldMakeExportProduceEmptyZipWhenAllMessagesAreExpired() throws Exception { - } - - @Ignore("Will be implemented latter") - @Test - public void vaultPurgeShouldMakeExportProduceAZipWhenOneMessageIsNotExpired() throws Exception { - } - - @Ignore("Will be implemented latter") - @Test - public void vaultPurgeShouldMakeExportProduceZipWhenAllMessagesAreNotExpired() throws Exception { - } - - @Ignore("Will be implemented latter") - @Test - public void vaultPurgeShouldNotAppendMessageToTheUserMailbox() { - } - - @Ignore("Will be implemented latter") - @Test public void vaultDeleteShouldDeleteMessageThenExportWithNoEntry() throws Exception { } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
