http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 c2706f9..0b68e56 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 @@ -21,16 +21,16 @@ package org.apache.james.mailets; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.FROM; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.modules.MailboxProbeImpl; +import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.modules.protocols.SieveProbeImpl; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; @@ -77,10 +77,10 @@ public class SieveDelivery { "\n" + "fileinto \"" + TARGETED_MAILBOX + "\";"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, RECIPIENT); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(TARGETED_MAILBOX) .awaitMessage(awaitAtMostOneMinute);
http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 4f5085e..c048d65 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 @@ -20,10 +20,8 @@ package org.apache.james.mailets; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -33,6 +31,8 @@ import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailrepository.api.MailRepositoryUrl; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.ToProcessor; import org.apache.james.transport.mailets.ToRepository; @@ -102,11 +102,11 @@ public class SmtpAuthIntegrationTest { @Test public void authenticatedSmtpSessionsShouldBeDelivered() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(FROM, PASSWORD) .sendMessage(FROM, FROM); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -114,12 +114,12 @@ public class SmtpAuthIntegrationTest { @Test public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, FROM); awaitAtMostOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1); assertThat( - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .hasAMessage()) http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java index ee95d3e..13522f4 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java @@ -42,8 +42,6 @@ public class Constants { public static final String DEFAULT_DOMAIN = "james.org"; public static final String LOCALHOST_IP = "127.0.0.1"; - public static final int IMAP_PORT = 1143; - public static final int SMTP_PORT = 1025; public static final String PASSWORD = "secret"; public static final String FROM = "user@" + DEFAULT_DOMAIN; public static final String RECIPIENT = "user2@" + DEFAULT_DOMAIN; http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 0e9b4a6..5c35a48 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 @@ -20,7 +20,6 @@ package org.apache.james.mailets.crypto; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -33,6 +32,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.transport.mailets.SMIMEDecrypt; import org.apache.james.transport.matchers.All; import org.apache.james.util.ClassLoaderUtils; @@ -48,7 +49,6 @@ import org.junit.rules.TemporaryFolder; public class SMIMEDecryptIntegrationTest { private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z"); - private static final int SMTP_SECURE_PORT = 10465; private static final String FROM = "sender@" + DEFAULT_DOMAIN; private static final String PASSWORD = "secret"; @@ -97,12 +97,12 @@ public class SMIMEDecryptIntegrationTest { @Test public void cryptedMessageShouldBeDecryptedWhenCertificateMatches() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpAuthRequiredPort()) .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, ClassLoaderUtils.getSystemResourceAsString("eml/crypted.eml")); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -111,12 +111,12 @@ public class SMIMEDecryptIntegrationTest { @Test public void cryptedMessageWithAttachmentShouldBeDecryptedWhenCertificateMatches() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpAuthRequiredPort()) .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, ClassLoaderUtils.getSystemResourceAsString("eml/crypted_with_attachment.eml")); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -126,12 +126,12 @@ public class SMIMEDecryptIntegrationTest { @Test public void cryptedMessageShouldNotBeDecryptedWhenCertificateDoesntMatch() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpAuthRequiredPort()) .authenticate(FROM, PASSWORD) .sendMessageWithHeaders(FROM, FROM, ClassLoaderUtils.getSystemResourceAsString("eml/bad_crypted.eml")); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 03f9506..124c3f8 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 @@ -20,7 +20,6 @@ package org.apache.james.mailets.crypto; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; @@ -34,6 +33,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.SMIMESign; import org.apache.james.transport.mailets.SetMimeHeader; @@ -52,7 +53,6 @@ import org.junit.rules.TemporaryFolder; public class SMIMESignIntegrationTest { private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z"); - private static final int SMTP_SECURE_PORT = 10465; @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); @@ -107,11 +107,11 @@ public class SMIMESignIntegrationTest { @Test public void authenticatedMessagesShouldBeSigned() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpAuthRequiredPort()) .authenticate(FROM, PASSWORD) .sendMessage(FROM, RECIPIENT); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX); awaitAtMostOneMinute.until(imapMessageReader::hasAMessage); @@ -121,10 +121,10 @@ public class SMIMESignIntegrationTest { @Test public void nonAuthenticatedMessagesShouldNotBeSigned() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpAuthRequiredPort()) .sendMessage(FROM, RECIPIENT); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX); awaitAtMostOneMinute.until(imapMessageReader::hasAMessage); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 ed3a9b6..dab089b 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 @@ -20,10 +20,8 @@ package org.apache.james.smtp; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hamcrest.Matchers.equalTo; @@ -36,6 +34,8 @@ import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailets.configuration.SmtpConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.SMTPIsAuthNetwork; import org.apache.james.utils.DataProbeImpl; @@ -106,7 +106,7 @@ public class SmtpAuthorizedAddressesTest { .requireAuthentication() .withAutorizedAddresses("127.0.0.0/8")); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, TO); awaitAtMostOneMinute @@ -124,7 +124,7 @@ public class SmtpAuthorizedAddressesTest { .withAutorizedAddresses("172.0.0.0/8")); assertThatThrownBy(() -> - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, TO)) .isEqualTo(new SMTPSendingException(SmtpSendingStep.RCPT, "530 5.7.1 Authentication Required\n")); } @@ -135,7 +135,7 @@ public class SmtpAuthorizedAddressesTest { .requireAuthentication() .withAutorizedAddresses("172.0.0.0/8")); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(FROM, PASSWORD) .sendMessage(FROM, TO); @@ -153,10 +153,10 @@ public class SmtpAuthorizedAddressesTest { .requireAuthentication() .withAutorizedAddresses("172.0.0.0/8")); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(TO, FROM); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 a974d3f..03a1e9e 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 @@ -22,11 +22,11 @@ package org.apache.james.smtp; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.SmtpConfiguration; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; @@ -69,7 +69,7 @@ public class SmtpBracketEnforcementTest { createJamesServer(SmtpConfiguration.builder() .doNotRequireBracketEnforcement()); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(USER, PASSWORD) .sendMessage(USER, USER); } @@ -79,7 +79,7 @@ public class SmtpBracketEnforcementTest { createJamesServer(SmtpConfiguration.builder() .doNotRequireBracketEnforcement()); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(USER, PASSWORD) .sendMessageNoBracket(USER, USER); } @@ -89,7 +89,7 @@ public class SmtpBracketEnforcementTest { createJamesServer(SmtpConfiguration.builder() .requireBracketEnforcement()); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(USER, PASSWORD) .sendMessage(USER, USER); } @@ -100,7 +100,7 @@ public class SmtpBracketEnforcementTest { .requireBracketEnforcement()); assertThatThrownBy(() -> - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(USER, PASSWORD) .sendMessageNoBracket(USER, USER)) .isEqualTo(new SMTPSendingException(SmtpSendingStep.RCPT, "501 5.5.2 Syntax error in parameters or arguments\n")); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 1a7d323..3faabe5 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 @@ -22,11 +22,11 @@ package org.apache.james.smtp; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.SmtpConfiguration; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; @@ -74,7 +74,7 @@ public class SmtpIdentityVerificationTest { .requireAuthentication() .verifyIdentity()); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(USER, PASSWORD).sendMessage(USER, USER); } @@ -84,7 +84,7 @@ public class SmtpIdentityVerificationTest { .requireAuthentication() .doNotVerifyIdentity()); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(ATTACKER, ATTACKER_PASSWORD) .sendMessage(USER, USER); } @@ -96,7 +96,7 @@ public class SmtpIdentityVerificationTest { .verifyIdentity()); assertThatThrownBy(() -> - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(ATTACKER, ATTACKER_PASSWORD) .sendMessage(USER, USER)) .isEqualTo(new SMTPSendingException(SmtpSendingStep.RCPT, "503 5.7.1 Incorrect Authentication for Specified Email Address\n")); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java index 2bcb837..e9dbeda 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java @@ -20,13 +20,13 @@ package org.apache.james.smtp; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailets.TemporaryJamesServer; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; @@ -66,16 +66,16 @@ public class SmtpNullSenderTest { @Test public void smtpLayerShouldAcceptEmptySenders() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessageWithHeaders("", USER,"Short message"); } @Test public void mailProcessingShouldDeliverNullSender() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessageWithHeaders("", USER,"Short message"); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 bc5aea9..9120eb3 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 @@ -22,11 +22,11 @@ package org.apache.james.smtp; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.SmtpConfiguration; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; @@ -73,7 +73,7 @@ public class SmtpSizeLimitationTest { .withMaxMessageSizeInKb(10)); assertThatThrownBy(() -> - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(USER, PASSWORD) .sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024))) .isEqualTo(new SMTPSendingException(SmtpSendingStep.Data, "500 Line length exceeded. See RFC 2821 #4.5.3.1.\n")); @@ -85,7 +85,7 @@ public class SmtpSizeLimitationTest { .doNotVerifyIdentity() .withMaxMessageSizeInKb(10)); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(USER, PASSWORD) .sendMessageWithHeaders(USER, USER,"Short message"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java index 88adc4e..e475af7 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java @@ -21,11 +21,9 @@ package org.apache.james.transport.mailets; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.FROM; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -34,6 +32,8 @@ import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.modules.server.ActiveMQQueueModule; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.All; @@ -84,7 +84,7 @@ public class AddFooterTest { @Test public void shouldAddFooterWhenSimpleMessage() throws Exception { - smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT) + smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(MimeMessageBuilder.mimeMessageBuilder() .setText("Any content") @@ -92,7 +92,7 @@ public class AddFooterTest { .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -102,7 +102,7 @@ public class AddFooterTest { @Test public void shouldAddFooterWhenMultipartMessage() throws Exception { - smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT) + smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(MimeMessageBuilder.mimeMessageBuilder() .setMultipartWithBodyParts( @@ -116,7 +116,7 @@ public class AddFooterTest { .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 c876847..babe313 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 @@ -20,10 +20,8 @@ package org.apache.james.transport.mailets; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -36,6 +34,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; @@ -126,13 +126,13 @@ public class AmqpForwardAttachmentTest { .filename("test.txt")) .setSubject("test"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 220c4dc..1211bc8 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 @@ -20,10 +20,8 @@ package org.apache.james.transport.mailets; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -36,6 +34,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; import org.apache.james.transport.matchers.SMTPAuthSuccessful; @@ -126,14 +126,14 @@ public class ContactExtractorTest { .addBccRecipient(BCC, "John Bcc2 <" + BCC2 + ">") .setSubject("Contact collection Rocks") .setText("This is my email"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .authenticate(SENDER, PASSWORD) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipients(TO, TO2, CC, CC2, BCC, BCC2)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(TO, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java index 697d90e..32f4ad0 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java @@ -26,7 +26,6 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.RECIPIENT2; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import java.util.Optional; @@ -39,6 +38,7 @@ import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailrepository.api.MailRepositoryUrl; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.transport.matchers.All; import org.apache.james.transport.matchers.dlp.Dlp; import org.apache.james.utils.DataProbeImpl; @@ -57,6 +57,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import com.google.inject.util.Modules; + import io.restassured.specification.RequestSpecification; public class DlpIntegrationTest { @@ -130,7 +131,7 @@ public class DlpIntegrationTest { "}]}") .put("/dlp/rules/" + DEFAULT_DOMAIN); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(MimeMessageBuilder.mimeMessageBuilder() .addToRecipient(RECIPIENT) @@ -162,7 +163,7 @@ public class DlpIntegrationTest { "}]}") .put("/dlp/rules/" + DEFAULT_DOMAIN); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(MimeMessageBuilder.mimeMessageBuilder() .addToRecipient(RECIPIENT) @@ -200,7 +201,7 @@ public class DlpIntegrationTest { "}]}") .put("/dlp/rules/" + DEFAULT_DOMAIN); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(MimeMessageBuilder.mimeMessageBuilder() .addToRecipient(RECIPIENT) @@ -238,7 +239,7 @@ public class DlpIntegrationTest { "}]}") .put("/dlp/rules/" + DEFAULT_DOMAIN); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(MimeMessageBuilder.mimeMessageBuilder() .addToRecipient(RECIPIENT) http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java index 7a58eff..4ba8505 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java @@ -23,7 +23,6 @@ import static io.restassured.RestAssured.given; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.hamcrest.Matchers.equalTo; @@ -37,6 +36,7 @@ import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailrepository.api.MailRepositoryUrl; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.All; import org.apache.james.transport.matchers.IsSenderInRRTLoop; @@ -149,7 +149,7 @@ public class GroupMappingRelayTest { String externalMail = "r...@yopmail.com"; webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + externalMail); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 6703b98..7b9dc10 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 @@ -21,10 +21,8 @@ package org.apache.james.transport.mailets; import static io.restassured.RestAssured.given; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -40,6 +38,8 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.modules.MailboxProbeImpl; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.All; import org.apache.james.transport.matchers.IsSenderInRRTLoop; @@ -149,13 +149,13 @@ public class GroupMappingTest { public void messageShouldRedirectToUserWhenBelongingToGroup() throws Exception { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -166,13 +166,13 @@ public class GroupMappingTest { public void messageShouldRedirectToUserDoesNotHaveSameDomainWhenBelongingToGroup() throws Exception { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN2); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -185,17 +185,17 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN2); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -207,13 +207,13 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + GROUP_ON_DOMAIN2); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX); awaitAtMostOneMinute.until(imapMessageReader::hasAMessage); @@ -228,13 +228,13 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + GROUP_ON_DOMAIN2); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -244,13 +244,13 @@ public class GroupMappingTest { public void messageShouldNotBeDuplicatedWhenRecipientIsAlsoPartOfGroup() throws Exception { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipients(GROUP_ON_DOMAIN1, USER_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -264,18 +264,18 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + GROUP_ON_DOMAIN2); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -291,7 +291,7 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN2 + "/" + GROUP_ON_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) @@ -308,13 +308,13 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN2 + "/" + GROUP_ON_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipients(GROUP_ON_DOMAIN1, USER_DOMAIN2)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -326,13 +326,13 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN2 + "/" + GROUP_ON_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipients(GROUP_ON_DOMAIN1, USER_DOMAIN2)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(SENDER, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -344,13 +344,13 @@ public class GroupMappingTest { jamesServer.getProbe(DataProbeImpl.class).addAddressMapping(SENDER_LOCAL_PART, DOMAIN1, GROUP_ON_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipients(GROUP_ON_DOMAIN1, USER_DOMAIN2)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(SENDER, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitNoMessage(awaitAtMostOneMinute); @@ -362,7 +362,7 @@ public class GroupMappingTest { jamesServer.getProbe(DataProbeImpl.class).addAddressMapping(SENDER_LOCAL_PART, DOMAIN1, GROUP_ON_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) @@ -379,13 +379,13 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -397,13 +397,13 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitNoMessage(awaitAtMostOneMinute); @@ -415,13 +415,13 @@ public class GroupMappingTest { webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN2 + "/" + USER_DOMAIN2); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient((GROUP_ON_DOMAIN1))); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN2, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -433,13 +433,13 @@ public class GroupMappingTest { String groupWithEncodedSlash = "a%2Fa@" + DOMAIN1; webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + groupWithEncodedSlash + "/" + USER_DOMAIN1); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(groupWithSlash)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -452,13 +452,13 @@ public class GroupMappingTest { String userWithEncodedSlash = "a%2Fa@" + DOMAIN1; webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + userWithEncodedSlash); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(userWithSlash, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -470,13 +470,13 @@ public class GroupMappingTest { String groupWithEncodedAt = "group%40" + DOMAIN1; webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + groupWithEncodedAt + "/" + userWithEncodedAt); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USER_DOMAIN1, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 e8ecd93..f121228 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 @@ -20,10 +20,8 @@ package org.apache.james.transport.mailets; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -40,6 +38,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; @@ -556,13 +556,13 @@ public class ICSAttachmentWorkflowTest { @Test public void calendarAttachmentShouldNotBePublishedInMQWhenNoICalAttachment() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithoutICSAttached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -572,13 +572,13 @@ public class ICSAttachmentWorkflowTest { @Test public void calendarAttachmentShouldBePublishedInMQWhenMatchingWorkflowConfiguration() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithICSAttached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -604,13 +604,13 @@ public class ICSAttachmentWorkflowTest { @Test public void headersShouldNotBeAddedInMailWhenNoICalAttachment() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithoutICSAttached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -625,13 +625,13 @@ public class ICSAttachmentWorkflowTest { @Test public void headersShouldBeAddedInMailWhenOneICalAttachment() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithICSAttached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -645,13 +645,13 @@ public class ICSAttachmentWorkflowTest { @Test public void headersShouldBeAddedInMailWhenOneBase64ICalAttachment() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithICSBase64Attached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -665,13 +665,13 @@ public class ICSAttachmentWorkflowTest { @Test public void base64CalendarAttachmentShouldBePublishedInMQWhenMatchingWorkflowConfiguration() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithICSBase64Attached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -690,13 +690,13 @@ public class ICSAttachmentWorkflowTest { @Test public void yahooBase64CalendarAttachmentShouldBePublishedInMQWhenMatchingWorkflowConfiguration() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(yahooInvitationMessage) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -716,13 +716,13 @@ public class ICSAttachmentWorkflowTest { @Test public void headersShouldBeFilledOnlyWithOneICalAttachmentWhenMailHasSeveral() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithThreeICSAttached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -736,13 +736,13 @@ public class ICSAttachmentWorkflowTest { @Test public void pipelineShouldSendSeveralJSONOverRabbitMQWhenSeveralAttachments() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(messageWithThreeICSAttached) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -774,13 +774,13 @@ public class ICSAttachmentWorkflowTest { public void mailShouldNotContainCalendarContentInTextBodyButAttachment() throws Exception { MimeMessage calendarMessage = MimeMessageUtil.mimeMessageFromStream(ClassLoader.getSystemResourceAsStream("eml/calendar.eml")); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(calendarMessage) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java index e0f9e16..ac79ee1 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java @@ -21,10 +21,8 @@ package org.apache.james.transport.mailets; import static io.restassured.RestAssured.given; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -36,6 +34,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.IsOverQuota; import org.apache.james.utils.DataProbeImpl; @@ -115,10 +115,10 @@ public class IsOverQuotaMatcherTest { .body(SMALL_SIZE.asLong()) .put("/quota/users/" + RECIPIENT + "/size"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, RECIPIENT); - IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -133,10 +133,10 @@ public class IsOverQuotaMatcherTest { .body(SMALL_SIZE.asLong()) .put("/quota/domains/" + DEFAULT_DOMAIN + "/size"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, RECIPIENT); - IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -151,10 +151,10 @@ public class IsOverQuotaMatcherTest { .body(LARGE_SIZE.asLong()) .put("/quota/users/" + RECIPIENT + "/size"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, RECIPIENT); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -166,10 +166,10 @@ public class IsOverQuotaMatcherTest { .body(SMALL_COUNT.asLong()) .put("/quota/users/" + RECIPIENT + "/count"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, RECIPIENT); - IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -184,10 +184,10 @@ public class IsOverQuotaMatcherTest { .body(SMALL_COUNT.asLong()) .put("/quota/domains/" + DEFAULT_DOMAIN + "/count"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, RECIPIENT); - IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + IMAPMessageReader messageReader = imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(FROM, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -202,10 +202,10 @@ public class IsOverQuotaMatcherTest { .body(LARGE_COUNT.asLong()) .put("/quota/users/" + RECIPIENT + "/count"); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FROM, RECIPIENT); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java index ac3887e..a97bcb6 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java @@ -21,12 +21,10 @@ package org.apache.james.transport.mailets; import static org.apache.james.MemoryJamesServerMain.SMTP_AND_IMAP_MODULE; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.FROM; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.RECIPIENT; import static org.apache.james.mailets.configuration.Constants.RECIPIENT2; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -38,6 +36,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.spamassassin.SpamAssassinResult; import org.apache.james.transport.matchers.All; import org.apache.james.util.docker.Images; @@ -102,10 +102,10 @@ public class SpamAssassinTest { @Test public void spamAssassinShouldAppendNewHeaderOnMessage() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(mailWithContent("This is the content", RECIPIENT)); - messageReader.connect(LOCALHOST_IP, IMAP_PORT) + messageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -118,10 +118,10 @@ public class SpamAssassinTest { @Test public void spamAssassinShouldAppendNewHeaderWhichDetectIsSpamWhenSpamMessage() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(mailWithContent(SPAM_CONTENT, RECIPIENT)); - messageReader.connect(LOCALHOST_IP, IMAP_PORT) + messageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -133,10 +133,10 @@ public class SpamAssassinTest { @Test public void spamAssassinShouldAppendNewHeaderWhichNoWhenNonSpamMessage() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(mailWithContent("This is the content", RECIPIENT)); - messageReader.connect(LOCALHOST_IP, IMAP_PORT) + messageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -148,10 +148,10 @@ public class SpamAssassinTest { @Test public void spamAssassinShouldAppendNewHeaderPerRecipientOnMessage() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(mailWithContent("This is the content", RECIPIENT, RECIPIENT2)); - messageReader.connect(LOCALHOST_IP, IMAP_PORT) + messageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); @@ -162,7 +162,7 @@ public class SpamAssassinTest { SpamAssassinResult.STATUS_MAIL_ATTRIBUTE_NAME); messageReader.disconnect() - .connect(LOCALHOST_IP, IMAP_PORT) + .connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT2, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/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 5ed44b3..b13b6e9 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 @@ -20,10 +20,8 @@ package org.apache.james.transport.mailets; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -36,6 +34,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.All; import org.apache.james.utils.DataProbeImpl; @@ -118,13 +118,13 @@ public class StripAttachmentTest { .setSubject("test") .build(); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(FROM) .recipient(RECIPIENT)); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
