JAMES-2267 Easy awaitSent for Smtp client
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fe92484c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fe92484c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fe92484c Branch: refs/heads/master Commit: fe92484c66c381eab7aecfda60d301a9f1d78bd2 Parents: fb6e2f0 Author: benwa <[email protected]> Authored: Tue Dec 19 14:43:41 2017 +0700 Committer: benwa <[email protected]> Committed: Fri Jan 5 09:33:19 2018 +0700 ---------------------------------------------------------------------- .../james/mailets/AddDeliveredToHeaderTest.java | 9 +- .../james/mailets/BounceIntegrationTest.java | 17 ++-- .../mailets/CommonMailetConfigurationTest.java | 9 +- .../GatewayRemoteDeliveryIntegrationTest.java | 18 ++-- .../mailets/NetworkMatcherIntegrationTest.java | 53 ++++++----- .../RecipientRewriteTableIntegrationTest.java | 37 ++++---- .../org/apache/james/mailets/SieveDelivery.java | 9 +- .../james/mailets/SmtpAuthIntegrationTest.java | 16 ++-- .../crypto/SMIMEDecryptIntegrationTest.java | 24 ++--- .../crypto/SMIMESignIntegrationTest.java | 15 ++-- .../james/smtp/SmtpAuthorizedAddressesTest.java | 26 +++--- .../james/smtp/SmtpBracketEnforcementTest.java | 17 ++-- .../smtp/SmtpIdentityVerificationTest.java | 13 ++- .../james/smtp/SmtpSizeLimitationTest.java | 8 +- .../mailets/AmqpForwardAttachmentTest.java | 7 +- .../transport/mailets/ContactExtractorTest.java | 5 +- .../transport/mailets/GroupMappingTest.java | 94 ++++++++++---------- .../mailets/ICSAttachmentWorkflowTest.java | 58 ++++++------ .../transport/mailets/StripAttachmentTest.java | 9 +- server/testing/pom.xml | 4 + .../apache/james/utils/SMTPMessageSender.java | 17 +++- 21 files changed, 231 insertions(+), 234 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 0de42e5..c0d4aae 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,6 +19,7 @@ package org.apache.james.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.mailbox.model.MailboxConstants; @@ -34,8 +35,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class AddDeliveredToHeaderTest { private static final String DEFAULT_DOMAIN = "james.org"; @@ -74,9 +73,9 @@ public class AddDeliveredToHeaderTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(from, recipient); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.readFirstMessageHeadersInInbox(recipient, PASSWORD) + messageSender.sendMessage(from, recipient) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.readFirstMessageHeadersInInbox(recipient, PASSWORD) .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + recipient)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 862f51c..ee269fb 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,6 +19,7 @@ package org.apache.james.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.MemoryJamesServerMain; @@ -47,8 +48,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class BounceIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; @@ -91,7 +90,7 @@ public class BounceIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); } } @@ -116,7 +115,7 @@ public class BounceIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); } } @@ -141,7 +140,7 @@ public class BounceIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); } } @@ -167,7 +166,7 @@ public class BounceIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); } } @@ -193,7 +192,7 @@ public class BounceIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); } } @@ -218,7 +217,7 @@ public class BounceIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); } } @@ -243,7 +242,7 @@ public class BounceIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(POSTMASTER, PASSWORD, MailboxConstants.INBOX)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 5e121f2..285de39 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,6 +19,7 @@ package org.apache.james.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.mailbox.model.MailboxConstants; @@ -33,8 +34,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class CommonMailetConfigurationTest { private static final String DEFAULT_DOMAIN = "james.org"; @@ -74,9 +73,9 @@ public class CommonMailetConfigurationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(from, recipient); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(recipient, PASSWORD)); + messageSender.sendMessage(from, recipient) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(recipient, PASSWORD)); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 9756adc..5c2c3e7 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,6 +19,7 @@ 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; @@ -59,7 +60,6 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; import org.testcontainers.containers.wait.HostPortWaitStrategy; -import com.jayway.awaitility.Duration; import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; @@ -93,7 +93,7 @@ public class GatewayRemoteDeliveryIntegrationTest { @Before public void setup() throws Exception { - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); RestAssured.requestSpecification = new RequestSpecBuilder() .setContentType(ContentType.JSON) @@ -127,7 +127,7 @@ public class GatewayRemoteDeliveryIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); } } @@ -147,7 +147,7 @@ public class GatewayRemoteDeliveryIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); } } @@ -167,7 +167,7 @@ public class GatewayRemoteDeliveryIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); } } @@ -187,7 +187,7 @@ public class GatewayRemoteDeliveryIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); } } @@ -245,7 +245,7 @@ public class GatewayRemoteDeliveryIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX)); } } @@ -293,7 +293,7 @@ public class GatewayRemoteDeliveryIntegrationTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX)); } } @@ -322,7 +322,7 @@ public class GatewayRemoteDeliveryIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); + calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 311da8e..709b3fe 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,6 +19,7 @@ package org.apache.james.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -43,8 +44,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class NetworkMatcherIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; @@ -110,10 +109,10 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } @@ -132,10 +131,10 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } @@ -154,10 +153,10 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } @@ -176,10 +175,10 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } @@ -198,10 +197,10 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } @@ -220,10 +219,10 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } @@ -242,12 +241,11 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse(); } } @@ -266,12 +264,11 @@ public class NetworkMatcherIntegrationTest { SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 ca90233..007a064 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,6 +19,7 @@ package org.apache.james.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.mailbox.model.MailboxConstants; @@ -33,8 +34,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class RecipientRewriteTableIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int IMAP_PORT = 1143; @@ -85,10 +84,10 @@ public class RecipientRewriteTableIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_JAMES, PASSWORD)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD)); + messageSender.sendMessage(FROM, RECIPIENT) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_JAMES, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD)); } } @@ -105,10 +104,10 @@ public class RecipientRewriteTableIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, RECIPIENT) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(RECIPIENT, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(RECIPIENT, PASSWORD)); } } @@ -127,11 +126,11 @@ public class RecipientRewriteTableIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, RECIPIENT) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(localUser, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(localUser, PASSWORD)); } } @@ -144,9 +143,9 @@ public class RecipientRewriteTableIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, ANY_AT_JAMES); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_ANOTHER_DOMAIN, PASSWORD)); + messageSender.sendMessage(FROM, ANY_AT_JAMES) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_ANOTHER_DOMAIN, PASSWORD)); } } @@ -159,9 +158,9 @@ public class RecipientRewriteTableIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, ANY_AT_JAMES); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(ANY_AT_JAMES, PASSWORD)); + messageSender.sendMessage(FROM, ANY_AT_JAMES) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(ANY_AT_JAMES, PASSWORD)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 c67bb9b..b5edede 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,6 +19,7 @@ package org.apache.james.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.mailbox.model.MailboxConstants; @@ -35,8 +36,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class SieveDelivery { private static final String DEFAULT_DOMAIN = "james.org"; @@ -79,9 +78,9 @@ public class SieveDelivery { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(from, recipient); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(recipient, PASSWORD, targetedMailbox)); + messageSender.sendMessage(from, recipient) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(recipient, PASSWORD, targetedMailbox)); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 8b5ecac..dd3f113 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,6 +19,7 @@ package org.apache.james.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -43,8 +44,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class SmtpAuthIntegrationTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; @@ -122,10 +121,10 @@ public class SmtpAuthIntegrationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } @@ -136,12 +135,11 @@ public class SmtpAuthIntegrationTest { SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, FROM); - - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); + calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 a7f42c3..e5f5f44 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,6 +19,7 @@ package org.apache.james.mailets.crypto; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -48,8 +49,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class SMIMEDecryptIntegrationTest { private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z"); private static final String LOCALHOST_IP = "127.0.0.1"; @@ -108,9 +107,10 @@ public class SMIMEDecryptIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + messageSender.sendMessageWithHeaders(FROM, FROM, + IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII)) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD)) .containsSequence("Crypted content"); @@ -122,9 +122,10 @@ public class SMIMEDecryptIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + messageSender.sendMessageWithHeaders(FROM, FROM, + IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII)) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD)) .containsSequence("Crypted Content with attachment"); @@ -136,9 +137,10 @@ public class SMIMEDecryptIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + messageSender.sendMessageWithHeaders(FROM, FROM, + IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII)) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD)) .containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 4c8dc82..531d96c 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,6 +19,7 @@ package org.apache.james.mailets.crypto; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -49,8 +50,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class SMIMESignIntegrationTest { private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z"); @@ -122,9 +121,9 @@ public class SMIMESignIntegrationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(FROM, RECIPIENT) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD)) .containsSequence("Content-Description: S/MIME Cryptographic Signature"); @@ -135,9 +134,9 @@ public class SMIMESignIntegrationTest { public void NonAuthenticatedMessagesShouldNotBeSigned() throws Exception { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(FROM, RECIPIENT) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD)) .doesNotContain("Content-Description: S/MIME Cryptographic Signature"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 3f95345..cf92df2 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,6 +19,7 @@ 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; @@ -54,7 +55,6 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; import org.testcontainers.containers.wait.HostPortWaitStrategy; -import com.jayway.awaitility.Duration; import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; @@ -85,7 +85,7 @@ public class SmtpAuthorizedAddressesTest { @Before public void setup() throws Exception { - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); RestAssured.requestSpecification = new RequestSpecBuilder() .setContentType(ContentType.JSON) @@ -155,10 +155,10 @@ public class SmtpAuthorizedAddressesTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { - messageSender.sendMessage(FROM, TO); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, TO) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(this::messageIsReceivedByTheSmtpServer); } } @@ -173,7 +173,7 @@ public class SmtpAuthorizedAddressesTest { SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, TO); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); } } @@ -186,11 +186,10 @@ public class SmtpAuthorizedAddressesTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { - messageSender.sendMessage(FROM, TO); - - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(FROM, TO) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(this::messageIsReceivedByTheSmtpServer); } } @@ -205,11 +204,10 @@ public class SmtpAuthorizedAddressesTest { SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(TO, FROM); - - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(TO, FROM) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 70364d9..6c9726b 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,6 +19,7 @@ package org.apache.james.smtp; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.MemoryJamesServerMain; @@ -40,8 +41,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class SmtpBracketEnforcementTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; @@ -102,8 +101,8 @@ public class SmtpBracketEnforcementTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) { - messageSender.sendMessage(USER, USER); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(USER, USER) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -115,8 +114,8 @@ public class SmtpBracketEnforcementTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) { - messageSender.sendMessageNoBracket(USER, USER); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessageNoBracket(USER, USER) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -128,8 +127,8 @@ public class SmtpBracketEnforcementTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) { - messageSender.sendMessage(USER, USER); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(USER, USER) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -142,7 +141,7 @@ public class SmtpBracketEnforcementTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) { messageSender.sendMessageNoBracket(USER, USER); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 a360625..58a7c05 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,6 +19,7 @@ package org.apache.james.smtp; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.MemoryJamesServerMain; @@ -40,8 +41,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class SmtpIdentityVerificationTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; @@ -102,8 +101,8 @@ public class SmtpIdentityVerificationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) { - messageSender.sendMessage(USER, USER); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(USER, USER) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -116,8 +115,8 @@ public class SmtpIdentityVerificationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, ATTACKER, ATTACKER_PASSWORD)) { - messageSender.sendMessage(USER, USER); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(USER, USER) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -131,7 +130,7 @@ public class SmtpIdentityVerificationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, ATTACKER, ATTACKER_PASSWORD)) { messageSender.sendMessage(USER, USER); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 40e5873..4bedf38 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,6 +19,7 @@ package org.apache.james.smtp; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.MemoryJamesServerMain; @@ -41,7 +42,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import com.google.common.base.Strings; -import com.jayway.awaitility.Duration; public class SmtpSizeLimitationTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -105,7 +105,7 @@ public class SmtpSizeLimitationTest { SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) { messageSender.sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed); } } @@ -118,8 +118,8 @@ public class SmtpSizeLimitationTest { try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) { - messageSender.sendMessageWithHeaders(USER, USER,"Short message"); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessageWithHeaders(USER, USER,"Short message") + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 5b4f451..6f11b48 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,6 +19,7 @@ package org.apache.james.transport.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -52,8 +53,6 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class AmqpForwardAttachmentTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -149,8 +148,8 @@ public class AmqpForwardAttachmentTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); } assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 94652f1..268be0b 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,6 +18,7 @@ ****************************************************************/ 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.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -49,8 +50,6 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class ContactExtractorTest { public static final String JAMES_ORG = "james.org"; @@ -136,7 +135,7 @@ public class ContactExtractorTest { IMAPMessageReader imap = new IMAPMessageReader("localhost", 1143)) { messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE) + calmlyAwait.atMost(ONE_MINUTE) .until(() -> imap.userReceivedMessage(TO, PASSWORD)); Optional<String> actual = amqpRule.readContent(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 ca7d04a..3aeb402 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,6 +19,7 @@ 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.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -61,7 +62,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.testcontainers.containers.wait.HostPortWaitStrategy; -import com.jayway.awaitility.Duration; import com.jayway.restassured.RestAssured; import com.jayway.restassured.specification.RequestSpecification; @@ -143,7 +143,7 @@ public class GroupMappingTest { .withMailetContainer(mailetContainer) .build(temporaryFolder); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25)); dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(DOMAIN1); @@ -183,9 +183,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN1, PASSWORD); @@ -206,9 +206,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN2, PASSWORD); @@ -230,10 +230,10 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN2, PASSWORD, 1)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN2, PASSWORD, 1)); } } @@ -251,9 +251,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN2, PASSWORD); @@ -277,9 +277,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); } } @@ -295,9 +295,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); } } @@ -318,9 +318,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); } } @@ -344,9 +344,9 @@ public class GroupMappingTest { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHaveNotBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD)); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN2, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHaveNotBeenSent); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN2, PASSWORD)); } } @@ -364,9 +364,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); } } @@ -384,9 +384,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD)); } } @@ -404,9 +404,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); } } @@ -424,9 +424,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); } } @@ -445,9 +445,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(userWithSlash, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(userWithSlash, PASSWORD)); } } @@ -465,9 +465,9 @@ public class GroupMappingTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); } } @@ -483,8 +483,8 @@ public class GroupMappingTest { .build(); try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); calmlyAwait.atMost(1, TimeUnit.MINUTES) .until(() -> { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 bdc0897..e9249e9 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,6 +19,7 @@ package org.apache.james.transport.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -57,7 +58,6 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; import com.google.common.collect.ImmutableList; -import com.jayway.awaitility.Duration; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; @@ -575,8 +575,8 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); } assertThat(amqpRule.readContent()).isEmpty(); @@ -593,8 +593,8 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); } Optional<String> content = amqpRule.readContent(); @@ -626,9 +626,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); @@ -650,9 +650,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); @@ -673,9 +673,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); @@ -696,9 +696,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); } Optional<String> content = amqpRule.readContent(); @@ -723,9 +723,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); } Optional<String> content = amqpRule.readContent(); @@ -751,9 +751,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); @@ -774,9 +774,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); } Optional<String> content1 = amqpRule.readContent(); @@ -813,9 +813,9 @@ public class ICSAttachmentWorkflowTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); String receivedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/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 b741b1f..3efb6eb 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,6 +19,7 @@ package org.apache.james.transport.mailets; +import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; @@ -48,8 +49,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class StripAttachmentTest { private static final String LOCALHOST_IP = "127.0.0.1"; @@ -140,9 +139,9 @@ public class StripAttachmentTest { try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); String processedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD); assertThat(processedMessage).contains("Matching attachment"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/testing/pom.xml b/server/testing/pom.xml index 3014fc8..988bb6f 100644 --- a/server/testing/pom.xml +++ b/server/testing/pom.xml @@ -36,6 +36,10 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> + <groupId>com.jayway.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
