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:10 UTC
[james-project] 06/12: [Refactoring] factorize setup in
BounceIntegrationTest
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 c95991c734cd9aa874cd6ee6fc725de483a591a1
Author: Rémi Kowalski <rk...@linagora.com>
AuthorDate: Thu Jun 11 14:30:25 2020 +0200
[Refactoring] factorize setup in BounceIntegrationTest
---
.../james/mailets/BounceIntegrationTest.java | 129 ++++++---------------
1 file changed, 34 insertions(+), 95 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 f7abaac..6359364 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
@@ -25,13 +25,15 @@ 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.awaitAtMostOneMinute;
+import java.util.Arrays;
+
+import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.MemoryJamesServerMain;
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.Bounce;
import org.apache.james.transport.mailets.DSNBounce;
import org.apache.james.transport.mailets.Forward;
@@ -45,6 +47,7 @@ import org.apache.james.transport.matchers.RecipientIs;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.TestIMAPClient;
import org.apache.james.utils.SMTPMessageSender;
+import org.apache.mailet.Mailet;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
@@ -62,7 +65,6 @@ public class BounceIntegrationTest {
public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
- private DataProbe dataProbe;
@After
public void tearDown() {
@@ -71,19 +73,7 @@ public class BounceIntegrationTest {
@Test
public void dsnBounceMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(DSNBounce.class)
- .addProperty("passThrough", "false")))
- .build(temporaryFolder.newFolder());
-
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
+ setup(DSNBounce.class);
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
@@ -94,21 +84,32 @@ public class BounceIntegrationTest {
.awaitMessage(awaitAtMostOneMinute);
}
- @Test
- public void bounceMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(
- generateMailetContainerConfiguration(MailetConfiguration.builder()
+ private void setup(Class<? extends Mailet> mailet, Pair<String, String>... additionalProperties) throws Exception {
+ MailetConfiguration.Builder mailetConfiguration = MailetConfiguration.builder()
.matcher(All.class)
- .mailet(Bounce.class)
- .addProperty("passThrough", "false")))
- .build(temporaryFolder.newFolder());
+ .mailet(mailet)
+ .addProperty("passThrough", "false");
+
+ Arrays.stream(additionalProperties)
+ .forEach(property -> mailetConfiguration.addProperty(property.getKey(), property.getValue()));
+
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .withMailetContainer(
+ generateMailetContainerConfiguration(mailetConfiguration))
+ .build(temporaryFolder.newFolder());
+
+ jamesServer.getProbe(DataProbeImpl.class)
+ .fluent()
+ .addDomain(DEFAULT_DOMAIN)
+ .addUser(RECIPIENT, PASSWORD)
+ .addUser(BOUNCE_RECEIVER, PASSWORD)
+ .addUser(POSTMASTER, PASSWORD);
+ }
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
+ @Test
+ public void bounceMailetShouldDeliverBounce() throws Exception {
+ setup(Bounce.class);
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
@@ -121,19 +122,7 @@ public class BounceIntegrationTest {
@Test
public void forwardMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Forward.class)
- .addProperty("forwardTo", BOUNCE_RECEIVER)
- .addProperty("passThrough", "false")))
- .build(temporaryFolder.newFolder());
-
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
+ setup(Forward.class, Pair.of("forwardTo", BOUNCE_RECEIVER));
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
@@ -146,20 +135,7 @@ public class BounceIntegrationTest {
@Test
public void redirectMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Redirect.class)
- .addProperty("recipients", BOUNCE_RECEIVER)
- .addProperty("passThrough", "false")))
- .build(temporaryFolder.newFolder());
-
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
+ setup(Redirect.class, Pair.of("recipients", BOUNCE_RECEIVER));
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
@@ -172,20 +148,7 @@ public class BounceIntegrationTest {
@Test
public void resendMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Resend.class)
- .addProperty("recipients", BOUNCE_RECEIVER)
- .addProperty("passThrough", "false")))
- .build(temporaryFolder.newFolder());
-
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
+ setup(Resend.class, Pair.of("recipients", BOUNCE_RECEIVER));
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
@@ -198,19 +161,7 @@ public class BounceIntegrationTest {
@Test
public void notifySenderMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(NotifySender.class)
- .addProperty("passThrough", "false")))
- .build(temporaryFolder.newFolder());
-
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
+ setup(NotifySender.class);
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
@@ -223,19 +174,7 @@ public class BounceIntegrationTest {
@Test
public void notifyPostmasterMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(NotifyPostmaster.class)
- .addProperty("passThrough", "false")))
- .build(temporaryFolder.newFolder());
-
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(POSTMASTER, PASSWORD);
+ setup(NotifyPostmaster.class);
messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org