JAMES-2267 Constant for calmlyAwait.atMost(ONE_MINUTE)
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/28eb15b3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/28eb15b3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/28eb15b3 Branch: refs/heads/master Commit: 28eb15b3e3a1c300d8055908b8a2a5384745b1b1 Parents: 7354cf0 Author: benwa <[email protected]> Authored: Thu Dec 21 09:23:37 2017 +0700 Committer: benwa <[email protected]> Committed: Fri Jan 5 09:33:19 2018 +0700 ---------------------------------------------------------------------- .../james/mailets/AddDeliveredToHeaderTest.java | 7 +- .../james/mailets/BounceIntegrationTest.java | 17 +++-- .../mailets/CommonMailetConfigurationTest.java | 7 +- .../GatewayRemoteDeliveryIntegrationTest.java | 19 +++--- .../mailets/NetworkMatcherIntegrationTest.java | 35 +++++----- .../RecipientRewriteTableIntegrationTest.java | 28 ++++---- .../org/apache/james/mailets/SieveDelivery.java | 7 +- .../james/mailets/SmtpAuthIntegrationTest.java | 11 ++-- .../james/mailets/configuration/Constants.java | 6 +- .../crypto/SMIMEDecryptIntegrationTest.java | 15 ++--- .../crypto/SMIMESignIntegrationTest.java | 11 ++-- .../james/smtp/SmtpAuthorizedAddressesTest.java | 20 +++--- .../james/smtp/SmtpBracketEnforcementTest.java | 11 ++-- .../smtp/SmtpIdentityVerificationTest.java | 9 ++- .../james/smtp/SmtpSizeLimitationTest.java | 7 +- .../mailets/AmqpForwardAttachmentTest.java | 7 +- .../transport/mailets/ContactExtractorTest.java | 7 +- .../transport/mailets/GroupMappingTest.java | 68 ++++++++++---------- .../mailets/ICSAttachmentWorkflowTest.java | 43 ++++++------- .../transport/mailets/StripAttachmentTest.java | 7 +- 20 files changed, 163 insertions(+), 179 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 36f95da..e95be9e 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 @@ -19,7 +19,6 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.IMAP_PORT; @@ -27,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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.probe.DataProbe; @@ -69,12 +68,12 @@ public class AddDeliveredToHeaderTest { public void receivedMessagesShouldContainDeliveredToHeaders() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessageHeaders()) .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + RECIPIENT); } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 6d8c1cf..f3fd032 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 @@ -19,14 +19,13 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.configuration.CommonProcessors; @@ -94,7 +93,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -119,7 +118,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -144,7 +143,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -170,7 +169,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -196,7 +195,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -221,7 +220,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(BOUNCE_RECEIVER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -246,7 +245,7 @@ public class BounceIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(POSTMASTER, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } private MailetContainer generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) { http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 7f13bc8..92d4fb3 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 @@ -19,7 +19,6 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.IMAP_PORT; @@ -27,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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; @@ -70,11 +69,11 @@ public class CommonMailetConfigurationTest { public void simpleMailShouldBeSent() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 34a44e4..f6bf420 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 @@ -19,7 +19,6 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; @@ -30,7 +29,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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -95,7 +94,7 @@ public class GatewayRemoteDeliveryIntegrationTest { @Before public void setup() throws Exception { - calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); + awaitOneMinute.until(() -> fakeSmtp.tryConnect(25)); RestAssured.requestSpecification = new RequestSpecBuilder() .setContentType(ContentType.JSON) @@ -129,7 +128,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -148,7 +147,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -167,7 +166,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -186,7 +185,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -244,7 +243,7 @@ public class GatewayRemoteDeliveryIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -292,7 +291,7 @@ public class GatewayRemoteDeliveryIntegrationTest { imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -319,7 +318,7 @@ public class GatewayRemoteDeliveryIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); } private boolean messageIsReceivedByTheSmtpServer() { http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 f02ab31..40d5197 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 @@ -19,13 +19,12 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.MemoryJamesServerMain; @@ -111,12 +110,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -132,12 +131,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -153,12 +152,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -174,12 +173,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -195,12 +194,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -216,12 +215,12 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -237,10 +236,10 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + awaitOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat( imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) @@ -262,10 +261,10 @@ public class NetworkMatcherIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + awaitOneMinute.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/28eb15b3/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 ea0773e..c07852a 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 @@ -19,13 +19,12 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; @@ -60,7 +59,6 @@ public class RecipientRewriteTableIntegrationTest { private TemporaryJamesServer jamesServer; private DataProbe dataProbe; - @Before public void setup() throws Exception { jamesServer = TemporaryJamesServer.builder().build(temporaryFolder); @@ -86,16 +84,16 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(ANY_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(OTHER_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -110,12 +108,12 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX); - calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage); + awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage); } @Test @@ -131,16 +129,16 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(localUser, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(OTHER_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -151,12 +149,12 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, ANY_AT_JAMES) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(ANY_AT_ANOTHER_DOMAIN, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -167,12 +165,12 @@ public class RecipientRewriteTableIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, ANY_AT_JAMES) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(ANY_AT_JAMES, PASSWORD) .select(IMAPMessageReader.INBOX); - calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage); + awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage); } private void createUserInbox(String username) throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 14538a6..1b7b524 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 @@ -19,7 +19,6 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.IMAP_PORT; @@ -27,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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; @@ -80,11 +79,11 @@ public class SieveDelivery { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(TARGETED_MAILBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 624edae..6f6f9db 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 @@ -19,13 +19,12 @@ package org.apache.james.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.MemoryJamesServerMain; @@ -124,21 +123,21 @@ public class SmtpAuthIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); - calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + awaitOneMinute.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/28eb15b3/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 7c16fbb..c4c902b 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 @@ -19,18 +19,22 @@ package org.apache.james.mailets.configuration; +import static com.jayway.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; +import static com.jayway.awaitility.Duration.ONE_MINUTE; + import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; public class Constants { - public static Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS; + public static Duration slowPacedPollInterval = FIVE_HUNDRED_MILLISECONDS; public static ConditionFactory calmlyAwait = Awaitility.with() .pollInterval(slowPacedPollInterval) .and() .with() .pollDelay(slowPacedPollInterval) .await(); + public static ConditionFactory awaitOneMinute = 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/28eb15b3/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 d02e901..e267fc3 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 @@ -19,11 +19,10 @@ package org.apache.james.mailets.crypto; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -111,12 +110,12 @@ public class SMIMEDecryptIntegrationTest { .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessage()).containsSequence("Crypted content"); } @@ -126,12 +125,12 @@ public class SMIMEDecryptIntegrationTest { .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Crypted Content with attachment"); } @@ -142,12 +141,12 @@ public class SMIMEDecryptIntegrationTest { .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 d13c5ac..4c67734 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 @@ -19,12 +19,11 @@ package org.apache.james.mailets.crypto; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -124,12 +123,12 @@ public class SMIMESignIntegrationTest { messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX); - calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage); + awaitOneMinute.until(imapMessageReader::hasAMessage); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Content-Description: S/MIME Cryptographic Signature"); } @@ -138,12 +137,12 @@ public class SMIMESignIntegrationTest { public void NonAuthenticatedMessagesShouldNotBeSigned() throws Exception { messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) .sendMessage(FROM, RECIPIENT) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX); - calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage); + awaitOneMinute.until(imapMessageReader::hasAMessage); assertThat(imapMessageReader.readFirstMessage()) .doesNotContain("Content-Description: S/MIME Cryptographic Signature"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 2bc721b..d70df3c 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 @@ -19,7 +19,6 @@ package org.apache.james.smtp; -import static com.jayway.awaitility.Duration.ONE_MINUTE; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; @@ -28,7 +27,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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -88,7 +87,7 @@ public class SmtpAuthorizedAddressesTest { @Before public void setup() throws Exception { - calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); + awaitOneMinute.until(() -> fakeSmtp.tryConnect(25)); RestAssured.requestSpecification = new RequestSpecBuilder() .setContentType(ContentType.JSON) @@ -157,10 +156,9 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, TO) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); - calmlyAwait.atMost(ONE_MINUTE) - .until(this::messageIsReceivedByTheSmtpServer); + awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -172,7 +170,7 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(FROM, TO); - calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); + awaitOneMinute.until(messageSender::messageSendingFailed); } @Test @@ -184,9 +182,9 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(FROM, PASSWORD) .sendMessage(FROM, TO) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); - calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer); } @Test @@ -197,12 +195,12 @@ public class SmtpAuthorizedAddressesTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .sendMessage(TO, FROM) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } private boolean messageIsReceivedByTheSmtpServer() { http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 14f9505..1ceafc3 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 @@ -19,12 +19,11 @@ package org.apache.james.smtp; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.TemporaryJamesServer; @@ -102,7 +101,7 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessage(USER, USER) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); } @Test @@ -113,7 +112,7 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageNoBracket(USER, USER) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); } @Test @@ -124,7 +123,7 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessage(USER, USER) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); } @Test @@ -135,6 +134,6 @@ public class SmtpBracketEnforcementTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageNoBracket(USER, USER); - calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); + awaitOneMinute.until(messageSender::messageSendingFailed); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 1217df5..fdf6e7e 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 @@ -19,12 +19,11 @@ package org.apache.james.smtp; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.TemporaryJamesServer; @@ -102,7 +101,7 @@ public class SmtpIdentityVerificationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD).sendMessage(USER, USER) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); } @Test @@ -114,7 +113,7 @@ public class SmtpIdentityVerificationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(ATTACKER, ATTACKER_PASSWORD) .sendMessage(USER, USER) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); } @Test @@ -126,7 +125,7 @@ public class SmtpIdentityVerificationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(ATTACKER, ATTACKER_PASSWORD) .sendMessage(USER, USER); - calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); + awaitOneMinute.until(messageSender::messageSendingFailed); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 f2bb893..cc3b9eb 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 @@ -19,12 +19,11 @@ package org.apache.james.smtp; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.TemporaryJamesServer; @@ -105,7 +104,7 @@ public class SmtpSizeLimitationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024)); - calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); + awaitOneMinute.until(messageSender::messageSendingFailed); } @Test @@ -117,6 +116,6 @@ public class SmtpSizeLimitationTest { messageSender.connect(LOCALHOST_IP, SMTP_PORT) .authenticate(USER, PASSWORD) .sendMessageWithHeaders(USER, USER,"Short message") - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 3e5ce99..c3fb08d 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 @@ -19,13 +19,12 @@ package org.apache.james.transport.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -142,12 +141,12 @@ public class AmqpForwardAttachmentTest { .mimeMessage(message) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT); } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 2ef708b..8afe671 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 @@ -18,14 +18,13 @@ ****************************************************************/ package org.apache.james.transport.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; 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.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; @@ -132,12 +131,12 @@ public class ContactExtractorTest { .mimeMessage(message) .sender(SENDER) .recipients(TO, TO2, CC, CC2, BCC, BCC2)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(TO, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); Optional<String> actual = amqpRule.readContent(); assertThat(actual).isNotEmpty(); http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 c672f85..7e1d3ee 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 @@ -19,13 +19,13 @@ package org.apache.james.transport.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; import static com.jayway.restassured.RestAssured.with; 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.SMTP_PORT; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.apache.james.mailets.configuration.Constants.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -145,7 +145,7 @@ public class GroupMappingTest { .withMailetContainer(mailetContainer) .build(temporaryFolder); - calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); + awaitOneMinute.until(() -> fakeSmtp.tryConnect(25)); dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(DOMAIN1); @@ -182,12 +182,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } @@ -200,12 +200,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } @@ -220,16 +220,16 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -243,12 +243,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX); - calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage); + awaitOneMinute.until(imapMessageReader::hasAMessage); assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } @@ -265,12 +265,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -282,12 +282,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipients(GROUP_ON_DOMAIN1, USER_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -303,17 +303,17 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN2)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -331,17 +331,17 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -355,12 +355,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -374,12 +374,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX); - calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage); + awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage); } @Test @@ -393,12 +393,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient((GROUP_ON_DOMAIN1))) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -412,12 +412,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(groupWithSlash)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -432,12 +432,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(userWithSlash, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -451,12 +451,12 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); } @Test @@ -469,7 +469,7 @@ public class GroupMappingTest { .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); calmlyAwait.atMost(1, TimeUnit.MINUTES) .until(() -> { http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 59d4a37..9930c29 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 @@ -19,13 +19,12 @@ package org.apache.james.transport.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import java.nio.charset.StandardCharsets; @@ -569,12 +568,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithoutICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(amqpRule.readContent()).isEmpty(); } @@ -586,12 +585,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); @@ -619,12 +618,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithoutICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).doesNotContain("X-MEETING-UID"); @@ -641,12 +640,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID); @@ -662,12 +661,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSBase64Attached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_BASE64_UID); @@ -683,12 +682,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithICSBase64Attached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); @@ -709,12 +708,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(yahooInvitationMessage) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); @@ -736,12 +735,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithThreeICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID); @@ -757,12 +756,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(messageWithThreeICSAttached) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); Optional<String> content1 = amqpRule.readContent(); assertThat(content1).isPresent(); @@ -796,12 +795,12 @@ public class ICSAttachmentWorkflowTest { .mimeMessage(calendarMessage) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 dd99994..b88a6a7 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 @@ -19,13 +19,12 @@ package org.apache.james.transport.mailets; -import static com.jayway.awaitility.Duration.ONE_MINUTE; 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.SMTP_PORT; -import static org.apache.james.mailets.configuration.Constants.calmlyAwait; +import static org.apache.james.mailets.configuration.Constants.awaitOneMinute; import static org.assertj.core.api.Assertions.assertThat; import javax.mail.internet.MimeMessage; @@ -134,12 +133,12 @@ public class StripAttachmentTest { .mimeMessage(message) .sender(FROM) .recipient(RECIPIENT)) - .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + .awaitSent(awaitOneMinute); imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) - .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + .awaitMessage(awaitOneMinute); assertThat(imapMessageReader.readFirstMessage()).contains("Matching attachment"); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
