You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/06/19 04:12:11 UTC
[james-project] 07/12: [Refactoring] rename BOUNCE_RECEIVER to
sender, and give unique passwords
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 7a1658fbeccdf55c470da6a80abd940ea2649bb2
Author: Rémi Kowalski <rk...@linagora.com>
AuthorDate: Thu Jun 11 14:36:40 2020 +0200
[Refactoring] rename BOUNCE_RECEIVER to sender, and give unique passwords
---
.../james/mailets/BounceIntegrationTest.java | 38 ++++++++++++----------
1 file changed, 20 insertions(+), 18 deletions(-)
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 6359364..a3aea2a 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
@@ -55,7 +55,9 @@ import org.junit.rules.TemporaryFolder;
public class BounceIntegrationTest {
public static final String POSTMASTER = "postmaster@" + DEFAULT_DOMAIN;
- public static final String BOUNCE_RECEIVER = "bounce.receiver@" + DEFAULT_DOMAIN;
+ public static final String POSTMASTER_PASSWORD = "postmasterSecret";
+ public static final String SENDER = "bounce.receiver@" + DEFAULT_DOMAIN;
+ public static final String SENDER_PASSWORD = "senderSecret";
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -76,10 +78,10 @@ public class BounceIntegrationTest {
setup(DSNBounce.class);
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
- .sendMessage(BOUNCE_RECEIVER, RECIPIENT);
+ .sendMessage(SENDER, RECIPIENT);
testIMAPClient.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
- .login(BOUNCE_RECEIVER, PASSWORD)
+ .login(SENDER, SENDER_PASSWORD)
.select(TestIMAPClient.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
@@ -103,8 +105,8 @@ public class BounceIntegrationTest {
.fluent()
.addDomain(DEFAULT_DOMAIN)
.addUser(RECIPIENT, PASSWORD)
- .addUser(BOUNCE_RECEIVER, PASSWORD)
- .addUser(POSTMASTER, PASSWORD);
+ .addUser(SENDER, SENDER_PASSWORD)
+ .addUser(POSTMASTER, POSTMASTER_PASSWORD);
}
@Test
@@ -112,49 +114,49 @@ public class BounceIntegrationTest {
setup(Bounce.class);
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
- .sendMessage(BOUNCE_RECEIVER, RECIPIENT);
+ .sendMessage(SENDER, RECIPIENT);
testIMAPClient.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
- .login(BOUNCE_RECEIVER, PASSWORD)
+ .login(SENDER, SENDER_PASSWORD)
.select(TestIMAPClient.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
@Test
public void forwardMailetShouldDeliverBounce() throws Exception {
- setup(Forward.class, Pair.of("forwardTo", BOUNCE_RECEIVER));
+ setup(Forward.class, Pair.of("forwardTo", SENDER));
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
testIMAPClient.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
- .login(BOUNCE_RECEIVER, PASSWORD)
+ .login(SENDER, SENDER_PASSWORD)
.select(TestIMAPClient.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
@Test
public void redirectMailetShouldDeliverBounce() throws Exception {
- setup(Redirect.class, Pair.of("recipients", BOUNCE_RECEIVER));
+ setup(Redirect.class, Pair.of("recipients", SENDER));
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
testIMAPClient.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
- .login(BOUNCE_RECEIVER, PASSWORD)
+ .login(SENDER, SENDER_PASSWORD)
.select(TestIMAPClient.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
@Test
public void resendMailetShouldDeliverBounce() throws Exception {
- setup(Resend.class, Pair.of("recipients", BOUNCE_RECEIVER));
+ setup(Resend.class, Pair.of("recipients", SENDER));
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
testIMAPClient.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
- .login(BOUNCE_RECEIVER, PASSWORD)
+ .login(SENDER, SENDER_PASSWORD)
.select(TestIMAPClient.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
@@ -164,10 +166,10 @@ public class BounceIntegrationTest {
setup(NotifySender.class);
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
- .sendMessage(BOUNCE_RECEIVER, RECIPIENT);
+ .sendMessage(SENDER, RECIPIENT);
testIMAPClient.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
- .login(BOUNCE_RECEIVER, PASSWORD)
+ .login(SENDER, SENDER_PASSWORD)
.select(TestIMAPClient.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
@@ -180,7 +182,7 @@ public class BounceIntegrationTest {
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
testIMAPClient.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
- .login(POSTMASTER, PASSWORD)
+ .login(POSTMASTER, POSTMASTER_PASSWORD)
.select(TestIMAPClient.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
@@ -193,13 +195,13 @@ public class BounceIntegrationTest {
}
private ProcessorConfiguration.Builder transport() {
- // This processor delivers emails to BOUNCE_RECEIVER and POSTMASTER
+ // This processor delivers emails to SENDER and POSTMASTER
// Other recipients will be bouncing
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIs.class)
- .matcherCondition(BOUNCE_RECEIVER)
+ .matcherCondition(SENDER)
.mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIs.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org