JAMES-2267 ImapMessageReader should be a test rule
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/456972f7 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/456972f7 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/456972f7 Branch: refs/heads/master Commit: 456972f78f656c4c113a9a106c83971fd732b821 Parents: fe92484 Author: benwa <[email protected]> Authored: Tue Dec 19 15:53:30 2017 +0700 Committer: benwa <[email protected]> Committed: Fri Jan 5 09:33:19 2018 +0700 ---------------------------------------------------------------------- .../james/mailets/AddDeliveredToHeaderTest.java | 15 +- .../james/mailets/BounceIntegrationTest.java | 66 ++++---- .../mailets/CommonMailetConfigurationTest.java | 11 +- .../GatewayRemoteDeliveryIntegrationTest.java | 21 +-- .../mailets/NetworkMatcherIntegrationTest.java | 76 +++++---- .../RecipientRewriteTableIntegrationTest.java | 55 +++++-- .../org/apache/james/mailets/SieveDelivery.java | 11 +- .../james/mailets/SmtpAuthIntegrationTest.java | 22 ++- .../crypto/SMIMEDecryptIntegrationTest.java | 34 ++-- .../crypto/SMIMESignIntegrationTest.java | 22 ++- .../james/smtp/SmtpAuthorizedAddressesTest.java | 13 +- .../mailets/AmqpForwardAttachmentTest.java | 15 +- .../transport/mailets/ContactExtractorTest.java | 18 ++- .../transport/mailets/GroupMappingTest.java | 162 ++++++++++++------- .../mailets/ICSAttachmentWorkflowTest.java | 110 ++++++++----- .../transport/mailets/StripAttachmentTest.java | 14 +- .../integration/SetMessagesMethodTest.java | 6 +- .../integration/cucumber/ImapStepdefs.java | 60 +++---- .../apache/james/utils/IMAPMessageReader.java | 79 +++++---- 19 files changed, 495 insertions(+), 315 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 c0d4aae..4464056 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 @@ -21,6 +21,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; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; @@ -45,6 +46,8 @@ public class AddDeliveredToHeaderTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -71,12 +74,16 @@ public class AddDeliveredToHeaderTest { jamesServer.getProbe(MailboxProbeImpl.class) .createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX"); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) { messageSender.sendMessage(from, recipient) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.readFirstMessageHeadersInInbox(recipient, PASSWORD) - .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + recipient)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(recipient, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessageHeaders()) + .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + recipient); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 ee269fb..b00b57e 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 @@ -23,7 +23,6 @@ import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait; import org.apache.james.MemoryJamesServerMain; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; @@ -61,6 +60,8 @@ public class BounceIntegrationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; private DataProbe dataProbe; @@ -86,12 +87,13 @@ public class BounceIntegrationTest { dataProbe.addUser(RECIPIENT, PASSWORD); dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(BOUNCE_RECEIVER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -111,12 +113,13 @@ public class BounceIntegrationTest { dataProbe.addUser(RECIPIENT, PASSWORD); dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(BOUNCE_RECEIVER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -136,12 +139,13 @@ public class BounceIntegrationTest { dataProbe.addUser(RECIPIENT, PASSWORD); dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(BOUNCE_RECEIVER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -162,12 +166,13 @@ public class BounceIntegrationTest { dataProbe.addUser(RECIPIENT, PASSWORD); dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(BOUNCE_RECEIVER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -188,12 +193,13 @@ public class BounceIntegrationTest { dataProbe.addUser(RECIPIENT, PASSWORD); dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(BOUNCE_RECEIVER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -213,12 +219,13 @@ public class BounceIntegrationTest { dataProbe.addUser(RECIPIENT, PASSWORD); dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(BOUNCE_RECEIVER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -238,12 +245,13 @@ public class BounceIntegrationTest { dataProbe.addUser(RECIPIENT, PASSWORD); dataProbe.addUser(POSTMASTER, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(POSTMASTER, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(POSTMASTER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 285de39..1a7e217 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 @@ -44,6 +44,8 @@ public class CommonMailetConfigurationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -71,11 +73,14 @@ public class CommonMailetConfigurationTest { dataProbe.addUser(recipient, PASSWORD); jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX"); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) { messageSender.sendMessage(from, recipient) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(recipient, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(recipient, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 5c2c3e7..0dbb573 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 @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.InMemoryDNSService; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; @@ -78,6 +77,8 @@ public class GatewayRemoteDeliveryIntegrationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private final TemporaryFolder smtpFolder = new TemporaryFolder(); private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP) @@ -241,12 +242,13 @@ public class GatewayRemoteDeliveryIntegrationTest { dataProbe.addDomain(JAMES_APACHE_ORG); dataProbe.addUser(FROM, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -289,12 +291,13 @@ public class GatewayRemoteDeliveryIntegrationTest { dataProbe.addDomain(JAMES_APACHE_ORG); dataProbe.addUser(FROM, PASSWORD); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT); - calmlyAwait.atMost(ONE_MINUTE).until(() -> - imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 709b3fe..eba6574 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 @@ -56,6 +56,8 @@ public class NetworkMatcherIntegrationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -106,14 +108,15 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -128,14 +131,15 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -150,14 +154,15 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -172,14 +177,15 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -194,14 +200,15 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -216,14 +223,15 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -238,15 +246,19 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); - assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse(); + assertThat( + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .hasAMessage()) + .isFalse(); } } @@ -261,15 +273,19 @@ public class NetworkMatcherIntegrationTest { .addMailet(toRepository())); try (SMTPMessageSender messageSender = - SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); - assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse(); + assertThat( + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .hasAMessage()) + .isFalse(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 007a064..58b69e3 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 @@ -53,6 +53,8 @@ public class RecipientRewriteTableIntegrationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; private DataProbe dataProbe; @@ -82,12 +84,18 @@ public class RecipientRewriteTableIntegrationTest { dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, ANY_AT_JAMES); dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { 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)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(ANY_AT_JAMES, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(OTHER_AT_JAMES, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -102,12 +110,14 @@ public class RecipientRewriteTableIntegrationTest { dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, ANY_AT_JAMES); dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(RECIPIENT, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX); + calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage); } } @@ -124,13 +134,18 @@ public class RecipientRewriteTableIntegrationTest { dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, nonDomainUser); dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, RECIPIENT) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(localUser, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(localUser, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(OTHER_AT_JAMES, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -141,11 +156,14 @@ public class RecipientRewriteTableIntegrationTest { createUserInbox(ANY_AT_JAMES); createUserInbox(ANY_AT_ANOTHER_DOMAIN); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, ANY_AT_JAMES) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_ANOTHER_DOMAIN, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(ANY_AT_ANOTHER_DOMAIN, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -156,11 +174,14 @@ public class RecipientRewriteTableIntegrationTest { createUserInbox(ANY_AT_JAMES); createUserInbox(ANY_AT_ANOTHER_DOMAIN); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, ANY_AT_JAMES) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(ANY_AT_JAMES, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(ANY_AT_JAMES, PASSWORD) + .select(IMAPMessageReader.INBOX); + calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 b5edede..40666af 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 @@ -46,6 +46,8 @@ public class SieveDelivery { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -76,11 +78,14 @@ public class SieveDelivery { "\n" + "fileinto \"" + targetedMailbox + "\";"); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);) { messageSender.sendMessage(from, recipient) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(recipient, PASSWORD, targetedMailbox)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(recipient, PASSWORD) + .select(targetedMailbox) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 dd3f113..53e96e5 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 @@ -54,7 +54,8 @@ public class SmtpAuthIntegrationTest { private static final String FROM = "fromuser@" + JAMES_APACHE_ORG; private static final String DROPPED_MAILS = "file://var/mail/dropped-mails/"; - + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); @@ -118,29 +119,34 @@ public class SmtpAuthIntegrationTest { @Test public void authenticatedSmtpSessionsShouldBeDelivered() throws Exception { try (SMTPMessageSender messageSender = - SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @Test public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception { try (SMTPMessageSender messageSender = - SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(FROM, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); - assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse(); + assertThat( + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .hasAMessage()) + .isFalse(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 e5f5f44..c95a095 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 @@ -61,6 +61,8 @@ public class SMIMEDecryptIntegrationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -105,29 +107,33 @@ public class SMIMEDecryptIntegrationTest { @Test public void cryptedMessageShouldBeDecryptedWhenCertificateMatches() throws Exception { - try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, 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"); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessage()).containsSequence("Crypted content"); } } @Test public void cryptedMessageWithAttachmentShouldBeDecryptedWhenCertificateMatches() throws Exception { - try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, 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)) + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Crypted Content with attachment"); } } @@ -135,14 +141,16 @@ public class SMIMEDecryptIntegrationTest { @Test public void cryptedMessageShouldNotBeDecryptedWhenCertificateDoesntMatch() throws Exception { - try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, 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)) + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessage()) .containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 531d96c..366513d 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 @@ -62,6 +62,8 @@ public class SMIMESignIntegrationTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; public static final String FROM = "user@" + DEFAULT_DOMAIN; @@ -119,26 +121,30 @@ public class SMIMESignIntegrationTest { @Test public void authenticatedMessagesShouldBeSigned() throws Exception { - try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);) { messageSender.sendMessage(FROM, RECIPIENT) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); - assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD)) + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX); + calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage); + assertThat(imapMessageReader.readFirstMessage()) .containsSequence("Content-Description: S/MIME Cryptographic Signature"); } } @Test public void NonAuthenticatedMessagesShouldNotBeSigned() throws Exception { - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) { messageSender.sendMessage(FROM, RECIPIENT) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); - assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD)) + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX); + calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage); + assertThat(imapMessageReader.readFirstMessage()) .doesNotContain("Content-Description: S/MIME Cryptographic Signature"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 cf92df2..f09218a 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 @@ -76,7 +76,9 @@ public class SmtpAuthorizedAddressesTest { .waitingFor(new HostPortWaitStrategy()); @Rule - public final RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp); + public RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); @@ -201,14 +203,15 @@ public class SmtpAuthorizedAddressesTest { .withAutorizedAddresses("172.0.0.0/8")); try (SMTPMessageSender messageSender = - SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(TO, FROM) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(FROM, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 6f11b48..6218137 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 @@ -79,6 +79,8 @@ public class AmqpForwardAttachmentTest { @Rule public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -145,11 +147,14 @@ public class AmqpForwardAttachmentTest { .recipient(new MailAddress(RECIPIENT)) .build(); - 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(ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT); http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 268be0b..164fae9 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 @@ -51,6 +51,10 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; public class ContactExtractorTest { + private static final String LOCALHOST_IP = "127.0.0.1"; + private static final int IMAP_PORT = 1143; + private static final int SMTP_PORT = 1025; + private static final String JAMES_APACHE_ORG = "james.org"; public static final String JAMES_ORG = "james.org"; public static final String SENDER = "sender@" + JAMES_ORG; @@ -70,6 +74,8 @@ public class ContactExtractorTest { @Rule public RuleChain chain = RuleChain.outerRule(rabbit).around(amqpRule).around(folder); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -131,12 +137,14 @@ public class ContactExtractorTest { .sender(new MailAddress(SENDER)) .recipients(new MailAddress(TO), new MailAddress(TO2), new MailAddress(CC), new MailAddress(CC2), new MailAddress(BCC), new MailAddress(BCC2)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.authentication("localhost", 1025, JAMES_ORG, SENDER, PASSWORD); - IMAPMessageReader imap = new IMAPMessageReader("localhost", 1143)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - messageSender.sendMessage(mail); - calmlyAwait.atMost(ONE_MINUTE) - .until(() -> imap.userReceivedMessage(TO, PASSWORD)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(TO, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); Optional<String> actual = amqpRule.readContent(); assertThat(actual).isNotEmpty(); http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 3aeb402..7c2fd11 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 @@ -96,6 +96,8 @@ public class GroupMappingTest { private final InMemoryDNSService inMemoryDNSService = new InMemoryDNSService(); @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private InetAddress containerIp; @Before @@ -181,15 +183,15 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { 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); - assertThat(processedMessage).contains(MESSAGE_CONTENT); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } } @@ -204,15 +206,15 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { 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); - assertThat(processedMessage).contains(MESSAGE_CONTENT); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN2, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } } @@ -228,12 +230,19 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { 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)); + + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN2, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -249,15 +258,15 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { 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); - assertThat(processedMessage).contains(MESSAGE_CONTENT); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN2, PASSWORD) + .select(IMAPMessageReader.INBOX); + calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage); + assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT); } } @@ -275,11 +284,14 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -293,11 +305,14 @@ public class GroupMappingTest { .recipients(new MailAddress(GROUP_ON_DOMAIN1), new MailAddress(USER_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -315,12 +330,19 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN2)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); - 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)); + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -340,13 +362,19 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { - messageSender.sendMessage(mail); + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - 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)); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -362,11 +390,14 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN2, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -382,11 +413,14 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX); + calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage); } } @@ -402,11 +436,14 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN2, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -422,11 +459,14 @@ public class GroupMappingTest { .recipient(new MailAddress(groupWithSlash)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN1, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -443,11 +483,14 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(userWithSlash, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(userWithSlash, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } @@ -463,11 +506,14 @@ public class GroupMappingTest { .recipient(new MailAddress(GROUP_ON_DOMAIN1)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(USER_DOMAIN2, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 e9249e9..799f210 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 @@ -440,7 +440,9 @@ public class ICSAttachmentWorkflowTest { public AmqpRule amqpRule = new AmqpRule(rabbitMqContainer, EXCHANGE_NAME, ROUTING_KEY); @Rule - public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule); + public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; private MimeMessage messageWithoutICSAttached; @@ -572,11 +574,14 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - 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(ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } assertThat(amqpRule.readContent()).isEmpty(); @@ -590,11 +595,14 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - 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(ONE_MINUTE).until(messageSender::messageHasBeenSent); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { + messageSender.sendMessage(mail) + .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } Optional<String> content = amqpRule.readContent(); @@ -624,13 +632,15 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); - String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).doesNotContain("X-MEETING-UID"); assertThat(receivedHeaders).doesNotContain("X-MEETING-METHOD"); @@ -648,13 +658,15 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); - String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID); assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD); @@ -671,13 +683,15 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); - String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_BASE64_UID); assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD); @@ -694,11 +708,14 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } Optional<String> content = amqpRule.readContent(); @@ -721,11 +738,14 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } Optional<String> content = amqpRule.readContent(); @@ -749,13 +769,15 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); - String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + String receivedHeaders = imapMessageReader.readFirstMessageHeaders(); assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID); assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD); @@ -772,11 +794,14 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); } Optional<String> content1 = amqpRule.readContent(); @@ -811,15 +836,16 @@ public class ICSAttachmentWorkflowTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { messageSender.sendMessage(mail) .awaitSent(calmlyAwait.atMost(ONE_MINUTE)); - calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD)); - - String receivedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD); - assertThat(receivedMessage).containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment"); + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessage()) + .containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment"); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/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 3efb6eb..07ebb67 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 @@ -63,6 +63,8 @@ public class StripAttachmentTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); private TemporaryJamesServer jamesServer; @@ -137,13 +139,15 @@ public class StripAttachmentTest { .recipient(new MailAddress(RECIPIENT)) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG); - IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) { 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"); + + imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + .login(RECIPIENT, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(calmlyAwait.atMost(ONE_MINUTE)); + assertThat(imapMessageReader.readFirstMessage()).contains("Matching attachment"); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
