JAMES-2294 Rename awaitOneMinute to awaitAtMostOneMinute
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d45cf810 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d45cf810 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d45cf810 Branch: refs/heads/master Commit: d45cf8109b35298d1c928bc01db88ce2837e40a7 Parents: 1d14ccb Author: Raphael Ouazana <[email protected]> Authored: Thu Jan 25 18:11:18 2018 +0100 Committer: benwa <[email protected]> Committed: Fri Jan 26 08:12:21 2018 +0700 ---------------------------------------------------------------------- .../james/mailets/AddDeliveredToHeaderTest.java | 6 +- .../james/mailets/BounceIntegrationTest.java | 16 ++--- .../mailets/CommonMailetConfigurationTest.java | 6 +- .../GatewayRemoteDeliveryIntegrationTest.java | 20 +++--- .../apache/james/mailets/MailetErrorsTest.java | 38 +++++------ .../mailets/NetworkMatcherIntegrationTest.java | 34 +++++----- .../RecipientRewriteTableIntegrationTest.java | 26 ++++---- .../org/apache/james/mailets/SieveDelivery.java | 6 +- .../james/mailets/SmtpAuthIntegrationTest.java | 10 +-- .../james/mailets/configuration/Constants.java | 2 +- .../crypto/SMIMEDecryptIntegrationTest.java | 14 ++-- .../crypto/SMIMESignIntegrationTest.java | 10 +-- .../james/smtp/SmtpAuthorizedAddressesTest.java | 18 +++--- .../james/smtp/SmtpBracketEnforcementTest.java | 10 +-- .../smtp/SmtpIdentityVerificationTest.java | 8 +-- .../james/smtp/SmtpSizeLimitationTest.java | 6 +- .../james/transport/mailets/AddFooterTest.java | 10 +-- .../mailets/AmqpForwardAttachmentTest.java | 6 +- .../transport/mailets/ContactExtractorTest.java | 6 +- .../transport/mailets/GroupMappingTest.java | 68 ++++++++++---------- .../mailets/ICSAttachmentWorkflowTest.java | 42 ++++++------ .../transport/mailets/SpamAssassinTest.java | 14 ++-- .../transport/mailets/StripAttachmentTest.java | 6 +- .../transport/mailets/ToRepositoryTest.java | 28 ++++---- 24 files changed, 205 insertions(+), 205 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java index e95be9e..f173489 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java @@ -26,7 +26,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.probe.DataProbe; @@ -68,12 +68,12 @@ public class AddDeliveredToHeaderTest { public void receivedMessagesShouldContainDeliveredToHeaders() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessageHeaders()) .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + RECIPIENT); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java index 120f5d3..295bdd6 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java @@ -25,7 +25,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.configuration.MailetConfiguration; @@ -91,7 +91,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -116,7 +116,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -141,7 +141,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -167,7 +167,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -193,7 +193,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -218,7 +218,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -243,7 +243,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(POSTMASTER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } private MailetContainer.Builder generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) { http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java index cb6a182..d45f29c 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java @@ -26,7 +26,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; @@ -70,11 +70,11 @@ public class CommonMailetConfigurationTest { public void simpleMailShouldBeSent() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java index 5e780f1..cb4cf10 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java @@ -26,7 +26,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -70,7 +70,7 @@ public class GatewayRemoteDeliveryIntegrationTest { @Before public void setup() throws Exception { - fakeSmtp.awaitStarted(awaitOneMinute); + fakeSmtp.awaitStarted(awaitAtMostOneMinute); inMemoryDNSService = new InMemoryDNSService() .registerMxRecord(JAMES_ANOTHER_DOMAIN, fakeSmtp.getContainer().getContainerIp()); @@ -99,7 +99,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); + awaitAtMostOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -118,7 +118,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); + awaitAtMostOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -137,7 +137,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); + awaitAtMostOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -156,7 +156,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); + awaitAtMostOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -180,7 +180,7 @@ public class GatewayRemoteDeliveryIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(fakeSmtp.isReceived(response -> response.body("", hasSize(0)))) .isTrue(); } @@ -205,7 +205,7 @@ public class GatewayRemoteDeliveryIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -234,7 +234,7 @@ public class GatewayRemoteDeliveryIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -256,7 +256,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); + awaitAtMostOneMinute.until(this::messageIsReceivedByTheSmtpServer); } private boolean messageIsReceivedByTheSmtpServer() { http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java index 763f908..ffd8013 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java @@ -25,7 +25,7 @@ import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.FROM; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; @@ -81,7 +81,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); } @Test @@ -100,7 +100,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); } @Test @@ -121,7 +121,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @@ -143,7 +143,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -168,7 +168,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -193,7 +193,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -212,7 +212,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); } @Test @@ -231,7 +231,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); } @Test @@ -252,7 +252,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -273,7 +273,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -298,7 +298,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -323,7 +323,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -348,7 +348,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -373,7 +373,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -402,7 +402,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -431,7 +431,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); } @Test @@ -460,7 +460,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } @Test @@ -489,7 +489,7 @@ public class MailetErrorsTest { smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1); } private ProcessorConfiguration.Builder errorProcessor() { http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java index 362f5af..e844d54 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.MemoryJamesServerMain; @@ -98,12 +98,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -119,12 +119,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -140,12 +140,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -161,12 +161,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -182,12 +182,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -203,12 +203,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -224,10 +224,10 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - awaitOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + awaitAtMostOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat( imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) @@ -249,10 +249,10 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - awaitOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + awaitAtMostOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat( imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java index d6d1162..c176fba 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; @@ -80,16 +80,16 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(ANY_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(OTHER_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -99,12 +99,12 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitNoMessage(awaitOneMinute); + .awaitNoMessage(awaitAtMostOneMinute); } @Test @@ -118,16 +118,16 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(localUser, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(OTHER_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -137,12 +137,12 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, ANY_AT_JAMES) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(ANY_AT_ANOTHER_DOMAIN, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -152,12 +152,12 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, ANY_AT_JAMES) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(ANY_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitNoMessage(awaitOneMinute); + .awaitNoMessage(awaitAtMostOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java index 1b7b524..cfe116b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java @@ -26,7 +26,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; @@ -79,11 +79,11 @@ public class SieveDelivery { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(TARGETED_MAILBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java index 19a3b5d..89dee69 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.MemoryJamesServerMain; @@ -104,21 +104,21 @@ public class SmtpAuthIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); - awaitOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + awaitAtMostOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat( imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java index c4c902b..0bdfb82 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java @@ -34,7 +34,7 @@ public class Constants { .with() .pollDelay(slowPacedPollInterval) .await(); - public static ConditionFactory awaitOneMinute = calmlyAwait.atMost(ONE_MINUTE); + public static ConditionFactory awaitAtMostOneMinute = calmlyAwait.atMost(ONE_MINUTE); public static final String DEFAULT_DOMAIN = "james.org"; public static final String LOCALHOST_IP = "127.0.0.1"; http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java index cb821ef..e1b2d57 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java @@ -22,7 +22,7 @@ package org.apache.james.mailets.crypto; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -100,12 +100,12 @@ public class SMIMEDecryptIntegrationTest { .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, ClassLoaderUtils.getSystemResourceAsString("eml/crypted.eml")) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessage()).containsSequence("Crypted content"); } @@ -115,12 +115,12 @@ public class SMIMEDecryptIntegrationTest { .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, ClassLoaderUtils.getSystemResourceAsString("eml/crypted_with_attachment.eml")) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Crypted Content with attachment"); } @@ -131,12 +131,12 @@ public class SMIMEDecryptIntegrationTest { .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, ClassLoaderUtils.getSystemResourceAsString("eml/bad_crypted.eml")) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java index 3bf2eb6..859ee94 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java @@ -23,7 +23,7 @@ import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -115,12 +115,12 @@ public class SMIMESignIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX); - awaitOneMinute.until(imapMessageReader::hasAMessage); + awaitAtMostOneMinute.until(imapMessageReader::hasAMessage); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Content-Description: S/MIME Cryptographic Signature"); } @@ -129,12 +129,12 @@ public class SMIMESignIntegrationTest { public void nonAuthenticatedMessagesShouldNotBeSigned() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX); - awaitOneMinute.until(imapMessageReader::hasAMessage); + awaitAtMostOneMinute.until(imapMessageReader::hasAMessage); assertThat(imapMessageReader.readFirstMessage()) .doesNotContain("Content-Description: S/MIME Cryptographic Signature"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java index db71574..bdc6e39 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -64,7 +64,7 @@ public class SmtpAuthorizedAddressesTest { @Before public void setup() throws Exception { - fakeSmtp.awaitStarted(awaitOneMinute); + fakeSmtp.awaitStarted(awaitAtMostOneMinute); } private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { @@ -102,9 +102,9 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, TO) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); - awaitOneMinute.until(() -> fakeSmtp.isReceived(response -> response + awaitAtMostOneMinute.until(() -> fakeSmtp.isReceived(response -> response .body("", hasSize(1)) .body("[0].from", equalTo(FROM)) .body("[0].subject", equalTo("test")))); @@ -118,7 +118,7 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, TO) - .awaitSentFail(awaitOneMinute); + .awaitSentFail(awaitAtMostOneMinute); } @Test @@ -130,9 +130,9 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, TO) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); - awaitOneMinute.until(() -> fakeSmtp.isReceived(response -> response + awaitAtMostOneMinute.until(() -> fakeSmtp.isReceived(response -> response .body("", hasSize(1)) .body("[0].from", equalTo(FROM)) .body("[0].subject", equalTo("test")))); @@ -146,12 +146,12 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(TO, FROM) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java index aeed2bb..4f2832b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java @@ -23,7 +23,7 @@ import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.SmtpConfiguration; @@ -70,7 +70,7 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessage(USER, USER) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); } @Test @@ -81,7 +81,7 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageNoBracket(USER, USER) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); } @Test @@ -92,7 +92,7 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessage(USER, USER) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); } @Test @@ -103,6 +103,6 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageNoBracket(USER, USER) - .awaitSentFail(awaitOneMinute); + .awaitSentFail(awaitAtMostOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java index 1c652d6..5a8582d 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java @@ -23,7 +23,7 @@ import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.SmtpConfiguration; @@ -74,7 +74,7 @@ public class SmtpIdentityVerificationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD).sendMessage(USER, USER) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); } @Test @@ -86,7 +86,7 @@ public class SmtpIdentityVerificationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(ATTACKER, ATTACKER_PASSWORD) .sendMessage(USER, USER) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); } @Test @@ -98,7 +98,7 @@ public class SmtpIdentityVerificationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(ATTACKER, ATTACKER_PASSWORD) .sendMessage(USER, USER) - .awaitSentFail(awaitOneMinute); + .awaitSentFail(awaitAtMostOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java index ff8bed4..28b31ea 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java @@ -23,7 +23,7 @@ import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.SmtpConfiguration; @@ -73,7 +73,7 @@ public class SmtpSizeLimitationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024)) - .awaitSentFail(awaitOneMinute); + .awaitSentFail(awaitAtMostOneMinute); } @Test @@ -85,6 +85,6 @@ public class SmtpSizeLimitationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageWithHeaders(USER, USER,"Short message") - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java index 5caac02..3e35051 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java @@ -26,7 +26,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.core.builder.MimeMessageBuilder; @@ -91,12 +91,12 @@ public class AddFooterTest { .setSubject("test")) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String processedMessage = imapMessageReader.readFirstMessage(); assertThat(processedMessage).contains(MATCH_ME); } @@ -116,12 +116,12 @@ public class AddFooterTest { .setSubject("test")) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String processedMessage = imapMessageReader.readFirstMessage(); assertThat(processedMessage).contains(MATCH_ME); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java index dd35211..b67d4eb 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -131,12 +131,12 @@ public class AmqpForwardAttachmentTest { .mimeMessage(message) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java index 06cfa0d..ba6bda2 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; @@ -126,12 +126,12 @@ public class ContactExtractorTest { .mimeMessage(message) .sender(SENDER) .recipients(TO, TO2, CC, CC2, BCC, BCC2)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(TO, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); Optional<String> actual = amqpRule.readContent(); assertThat(actual).isNotEmpty(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index 1ccaf61..d1c71a8 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -25,7 +25,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -104,7 +104,7 @@ public class GroupMappingTest { .withMailetContainer(mailetContainer) .build(temporaryFolder); - fakeSmtp.awaitStarted(awaitOneMinute); + fakeSmtp.awaitStarted(awaitAtMostOneMinute); dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(DOMAIN1); @@ -143,12 +143,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } @@ -161,12 +161,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } @@ -181,16 +181,16 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -204,12 +204,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX); - awaitOneMinute.until(imapMessageReader::hasAMessage); + awaitAtMostOneMinute.until(imapMessageReader::hasAMessage); assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } @@ -226,12 +226,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -243,12 +243,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipients(GROUP_ON_DOMAIN1, USER_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -264,17 +264,17 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -292,17 +292,17 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSentFail(awaitOneMinute); + .awaitSentFail(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitNoMessage(awaitOneMinute); + .awaitNoMessage(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitNoMessage(awaitOneMinute); + .awaitNoMessage(awaitAtMostOneMinute); } @Test @@ -316,12 +316,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -335,12 +335,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitNoMessage(awaitOneMinute); + .awaitNoMessage(awaitAtMostOneMinute); } @Test @@ -354,12 +354,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient((GROUP_ON_DOMAIN1))) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -373,12 +373,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(groupWithSlash)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -393,12 +393,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(userWithSlash, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -412,12 +412,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); } @Test @@ -430,7 +430,7 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); fakeSmtp.isReceived(response -> response .body("[0].from", equalTo(SENDER)) http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java index a7d0a5e..d3e68e6 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -559,12 +559,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithoutICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(amqpRule.readContent()).isEmpty(); } @@ -576,12 +576,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); @@ -609,12 +609,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithoutICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).doesNotContain("X-MEETING-UID"); @@ -631,12 +631,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID); @@ -652,12 +652,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSBase64Attached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_BASE64_UID); @@ -673,12 +673,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSBase64Attached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); @@ -699,12 +699,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(yahooInvitationMessage) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); @@ -726,12 +726,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithThreeICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID); @@ -747,12 +747,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithThreeICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); Optional<String> content1 = amqpRule.readContent(); assertThat(content1).isPresent(); @@ -786,12 +786,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(calendarMessage) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java index f97bf1d..bd1d74b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java @@ -26,7 +26,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; @@ -106,12 +106,12 @@ public class SpamAssassinTest { public void spamAssassinShouldAppendNewHeaderOnMessage() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(mailWithContent("This is the content")) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); messageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(messageReader.readFirstMessageHeaders()) .contains( @@ -123,12 +123,12 @@ public class SpamAssassinTest { public void spamAssassinShouldAppendNewHeaderWhichDetectIsSpamWhenSpamMessage() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(mailWithContent(SPAM_CONTENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); messageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String receivedHeaders = messageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains(SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + ": YES"); @@ -139,12 +139,12 @@ public class SpamAssassinTest { public void spamAssassinShouldAppendNewHeaderWhichNoWhenNonSpamMessage() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(mailWithContent("This is the content")) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); messageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); String receivedHeaders = messageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains(SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + ": NO"); http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java index 967ce53..9e35168 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; import javax.mail.internet.MimeMessage; @@ -123,12 +123,12 @@ public class StripAttachmentTest { .mimeMessage(message) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute); + .awaitMessage(awaitAtMostOneMinute); assertThat(imapMessageReader.readFirstMessage()).contains("Matching attachment"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/d45cf810/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java index 3f821fa..4a4edb5 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java @@ -25,7 +25,7 @@ import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -99,22 +99,22 @@ public class ToRepositoryTest { public void incomingShouldBeStoredInProcessorByDefault() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(RECIPIENT, RECIPIENT) - .awaitSent(awaitOneMinute) + .awaitSent(awaitAtMostOneMinute) .sendMessage(RECIPIENT, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 2); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 2); } @Test public void userShouldBeAbleToAccessReprocessedMails() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(RECIPIENT, RECIPIENT) - .awaitSent(awaitOneMinute) + .awaitSent(awaitAtMostOneMinute) .sendMessage(RECIPIENT, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 2); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 2); with() .spec(webAdminAPI) @@ -129,20 +129,20 @@ public class ToRepositoryTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute) + .awaitMessage(awaitAtMostOneMinute) .hasMessageCount(2); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 0); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 0); } @Test public void userShouldBeAbleToAccessReprocessedMail() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(RECIPIENT, RECIPIENT) - .awaitSent(awaitOneMinute) + .awaitSent(awaitAtMostOneMinute) .sendMessage(RECIPIENT, RECIPIENT) - .awaitSent(awaitOneMinute); + .awaitSent(awaitAtMostOneMinute); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 2); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 2); String key = probe.listMailKeys(CUSTOM_REPOSITORY).get(0); with() @@ -158,8 +158,8 @@ public class ToRepositoryTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(awaitOneMinute) + .awaitMessage(awaitAtMostOneMinute) .hasMessageCount(1); - awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); + awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
