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 2018/01/05 02:56:20 UTC
[01/44] james-project git commit: JAMES-2267 Use constants for
processor state
Repository: james-project
Updated Branches:
refs/heads/improve-mailet-testing-experience-v1 [created] 55dc6ff94
JAMES-2267 Use constants for processor state
Also rely on provided specific builders for specific states
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b8e7d528
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b8e7d528
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b8e7d528
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: b8e7d528260623623464c6b320e65e4d2d1d0e71
Parents: 2e14352
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 11:14:07 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:50 2018 +0700
----------------------------------------------------------------------
.../james/mailets/BounceIntegrationTest.java | 8 ++--
.../GatewayRemoteDeliveryIntegrationTest.java | 15 +++----
.../mailets/NetworkMatcherIntegrationTest.java | 43 ++++++++------------
.../james/mailets/SmtpAuthIntegrationTest.java | 13 +++---
.../mailets/configuration/CommonProcessors.java | 27 +++++-------
.../configuration/ProcessorConfiguration.java | 24 ++++++++++-
.../crypto/SMIMEDecryptIntegrationTest.java | 3 +-
.../crypto/SMIMESignIntegrationTest.java | 3 +-
.../james/smtp/SmtpAuthorizedAddressesTest.java | 12 +++---
.../james/smtp/SmtpBracketEnforcementTest.java | 10 ++---
.../smtp/SmtpIdentityVerificationTest.java | 8 ++--
.../james/smtp/SmtpSizeLimitationTest.java | 10 ++---
.../mailets/AmqpForwardAttachmentTest.java | 3 +-
.../transport/mailets/ContactExtractorTest.java | 3 +-
.../transport/mailets/GroupMappingTest.java | 7 ++--
.../mailets/ICSAttachmentWorkflowTest.java | 3 +-
.../transport/mailets/StripAttachmentTest.java | 3 +-
17 files changed, 89 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 1d0c2a9..f79e61c 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
@@ -257,8 +257,7 @@ public class BounceIntegrationTest {
private ProcessorConfiguration transport() {
// This processor delivers emails to BOUNCE_RECEIVER and POSTMASTER
// Other recipients will be bouncing
- return ProcessorConfiguration.builder()
- .state("transport")
+ return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
@@ -274,13 +273,12 @@ public class BounceIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces"))
+ .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES))
.build();
}
public static ProcessorConfiguration bounces(MailetConfiguration.Builder redirectionMailetConfiguration) {
- return ProcessorConfiguration.builder()
- .state("bounces")
+ return ProcessorConfiguration.bounces()
.addMailet(redirectionMailetConfiguration)
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 0f07481..5eb773b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -274,8 +274,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.threads(5)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -367,8 +366,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
public ProcessorConfiguration root() {
// Custom in memory DNS resolution is not possible combined with InSpamerBackList
- return ProcessorConfiguration.builder()
- .state("root")
+ return ProcessorConfiguration.root()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -385,8 +383,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
}
private ProcessorConfiguration relayOnlyTransport(String gatewayProperty) {
- return ProcessorConfiguration.builder()
- .state("transport")
+ return ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -407,8 +404,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
}
private ProcessorConfiguration relayAndLocalDeliveryTransport(String gatewayProperty) {
- return ProcessorConfiguration.builder()
- .state("transport")
+ return ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
@@ -429,8 +425,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
}
private ProcessorConfiguration directResolutionTransport() {
- return ProcessorConfiguration.builder()
- .state("transport")
+ return ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index d9fb2fd..985b906 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -94,8 +94,7 @@ public class NetworkMatcherIntegrationTest {
}
private ProcessorConfiguration deliverOnlyTransport() {
- return ProcessorConfiguration.builder()
- .state("transport")
+ return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -117,13 +116,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void mailsFromAuthorizedNetworksShouldBeDeliveredWithRemoteAddrInNetwork() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -140,13 +138,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void mailsFromAuthorizedNetworksShouldBeDeliveredWithRemoteAddrNotInNetwork() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrNotInNetwork.class)
.matcherCondition("172.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -163,13 +160,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void remoteAddrInNetworkShouldSupportLargerMask() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.0.0.0/2")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -186,13 +182,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void remoteAddrInNetworkShouldSupportRangesDefinedByAMiddleIp() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.0.4.108/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -209,13 +204,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void remoteAddrInNetworkShouldSupportRangesDefinedByEndingIp() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.255.255.255/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -232,13 +226,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void remoteAddrInNetworkShouldSupportRangesWithNonEightMultipleSubMasks() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("126.0.0.0/4")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -255,13 +248,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void mailsFromNonAuthorizedNetworksShouldNotBeDeliveredWithRemoteAddrInNetwork() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("172.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -280,13 +272,12 @@ public class NetworkMatcherIntegrationTest {
@Test
public void mailsFromNonAuthorizedNetworksShouldNotBeDeliveredWithRemoteAddrNotInNetwork() throws Exception {
- jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.builder()
- .state("root")
+ jamesServer = createJamesServerWithRootProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RemoteAddrNotInNetwork.class)
.matcherCondition("127.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 012334c..f2a7b04 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
@@ -65,16 +65,15 @@ public class SmtpAuthIntegrationTest {
@Before
public void setup() throws Exception {
- ProcessorConfiguration rootProcessor = ProcessorConfiguration.builder()
- .state("root")
+ ProcessorConfiguration rootProcessor = ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces"))
+ .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES))
.build();
MailetContainer mailetContainer = MailetContainer.builder()
@@ -104,8 +103,7 @@ public class SmtpAuthIntegrationTest {
}
private ProcessorConfiguration deliverOnlyTransport() {
- return ProcessorConfiguration.builder()
- .state("transport")
+ return ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
@@ -115,8 +113,7 @@ public class SmtpAuthIntegrationTest {
}
private ProcessorConfiguration bounces() {
- return ProcessorConfiguration.builder()
- .state("bounces")
+ return ProcessorConfiguration.bounces()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index 0af0d61..a3f9a4a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -48,9 +48,8 @@ public class CommonProcessors {
public static final String ERROR_REPOSITORY = "file://var/mail/error/";
- public static ProcessorConfiguration root() {
- return ProcessorConfiguration.builder()
- .state("root")
+ public static ProcessorConfiguration root() {
+ return ProcessorConfiguration.root()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -68,7 +67,7 @@ public class CommonProcessors {
.matcher(HasMailAttribute.class)
.matcherCondition("spamChecked")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(SetMailAttribute.class)
@@ -76,28 +75,27 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(MailetConfiguration.builder()
.matcher(InSpammerBlacklist.class)
.matcherCondition("query.bondedsender.org.")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(MailetConfiguration.builder()
.matcher(InSpammerBlacklist.class)
.matcherCondition("dnsbl.njabl.org.")
.mailet(ToProcessor.class)
- .addProperty("processor", "spam")
+ .addProperty("processor", ProcessorConfiguration.STATE_SPAM)
.addProperty("notice", "550 Requested action not taken: rejected - see http://njabl.org/"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.build();
}
public static ProcessorConfiguration error() {
- return ProcessorConfiguration.builder()
- .state("error")
+ return ProcessorConfiguration.error()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -110,8 +108,7 @@ public class CommonProcessors {
}
public static ProcessorConfiguration transport() {
- return ProcessorConfiguration.builder()
- .state("transport")
+ return ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
@@ -158,8 +155,7 @@ public class CommonProcessors {
}
public static ProcessorConfiguration spam() {
- return ProcessorConfiguration.builder()
- .state("spam")
+ return ProcessorConfiguration.spam()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -200,8 +196,7 @@ public class CommonProcessors {
}
public static ProcessorConfiguration bounces() {
- return ProcessorConfiguration.builder()
- .state("bounces")
+ return ProcessorConfiguration.bounces()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
index 5faa8be..8f207fa 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
@@ -28,12 +28,34 @@ import com.google.common.collect.ImmutableList;
public class ProcessorConfiguration implements SerializableAsXml {
+ public static final String STATE_TRANSPORT = "transport";
+ public static final String STATE_ROOT = "root";
+ public static final String STATE_BOUNCES = "bounces";
+ public static final String STATE_ERROR = "error";
+ public static final String STATE_SPAM = "spam";
+
public static Builder builder() {
return new Builder();
}
public static Builder transport() {
- return builder().state("transport");
+ return builder().state(STATE_TRANSPORT);
+ }
+
+ public static Builder root() {
+ return builder().state(STATE_ROOT);
+ }
+
+ public static Builder bounces() {
+ return builder().state(STATE_BOUNCES);
+ }
+
+ public static Builder error() {
+ return builder().state(STATE_ERROR);
+ }
+
+ public static Builder spam() {
+ return builder().state(STATE_SPAM);
}
public static class Builder {
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 9b4a13c..19ca898 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
@@ -76,8 +76,7 @@ public class SMIMEDecryptIntegrationTest {
.threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 1fad706..c943d76 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
@@ -82,8 +82,7 @@ public class SMIMESignIntegrationTest {
.threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 d0cdcaa..389af55 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
@@ -110,15 +110,13 @@ public class SmtpAuthorizedAddressesTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
.threads(5)
- .addProcessor(ProcessorConfiguration.builder()
- .state("root")
+ .addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
@@ -133,12 +131,12 @@ public class SmtpAuthorizedAddressesTest {
.addProperty("maxDnsProblemRetries", "0")
.addProperty("deliveryThreads", "10")
.addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
+ .addProperty("bounceProcessor", ProcessorConfiguration.STATE_BOUNCES)
.addProperty("gateway", fakeSmtp.getContainerIp()))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")))
+ .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 51e33e8..bfc553b 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
@@ -73,15 +73,13 @@ public class SmtpBracketEnforcementTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
.threads(5)
- .addProcessor(ProcessorConfiguration.builder()
- .state("root")
+ .addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
@@ -90,7 +88,7 @@ public class SmtpBracketEnforcementTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")))
+ .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 9317282..2dc73d2 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
@@ -75,15 +75,13 @@ public class SmtpIdentityVerificationTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
.threads(5)
- .addProcessor(ProcessorConfiguration.builder()
- .state("root")
+ .addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 73a4426..46d90b9 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
@@ -74,15 +74,13 @@ public class SmtpSizeLimitationTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
.threads(5)
- .addProcessor(ProcessorConfiguration.builder()
- .state("root")
+ .addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
@@ -91,7 +89,7 @@ public class SmtpSizeLimitationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")))
+ .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 054ec81..11108ff 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
@@ -92,8 +92,7 @@ public class AmqpForwardAttachmentTest {
.threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 8429a6e..e63a9db 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
@@ -84,8 +84,7 @@ public class ContactExtractorTest {
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(
- ProcessorConfiguration.builder()
- .state("transport")
+ ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ContactExtractor.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 ae536f9..9911a21 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
@@ -110,8 +110,7 @@ public class GroupMappingTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DOMAIN1)
.threads(5)
- .addProcessor(ProcessorConfiguration.builder()
- .state("root")
+ .addProcessor(ProcessorConfiguration.root()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -123,11 +122,11 @@ public class GroupMappingTest {
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")))
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 cdafabc..2359b00 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
@@ -458,8 +458,7 @@ public class ICSAttachmentWorkflowTest {
.threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8e7d528/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 bc13e9a..69397e2 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
@@ -76,8 +76,7 @@ public class StripAttachmentTest {
.threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
+ .addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[07/44] james-project git commit: JAMES-2267 Improve
MimeMessageBuilder fluency: implicit build calling
Posted by bt...@apache.org.
JAMES-2267 Improve MimeMessageBuilder fluency: implicit build calling
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0df7c31b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0df7c31b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0df7c31b
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 0df7c31b1a7a1b0b2c740f4f62d0ce77f5b15a0a
Parents: 7d15ef0
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 10:12:48 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:50 2018 +0700
----------------------------------------------------------------------
.../AutomaticallySentMailDetectorImplTest.java | 6 +-
.../org/apache/mailet/base/test/FakeMail.java | 14 +-
.../mailet/base/test/MimeMessageBuilder.java | 29 +++++
.../mailets/ICALToJsonAttributeTest.java | 11 +-
.../transport/mailets/ContactExtractorTest.java | 40 +++---
.../MailAttributesListToMimeHeadersTest.java | 7 +-
.../mailets/RemoveMimeHeaderByPrefixTest.java | 27 ++--
.../transport/mailets/RemoveMimeHeaderTest.java | 27 ++--
.../transport/mailets/StripAttachmentTest.java | 127 ++++++-------------
.../mailets/UseHeaderRecipientsTest.java | 26 ++--
.../matchers/HasHeaderWithPrefixTest.java | 12 +-
.../transport/matchers/HasMimeTypeTest.java | 35 ++---
.../transport/matchers/TooManyLinesTest.java | 11 +-
.../james/mailets/BounceIntegrationTest.java | 17 +--
.../GatewayRemoteDeliveryIntegrationTest.java | 40 ++----
.../mailets/NetworkMatcherIntegrationTest.java | 37 ++----
.../james/mailets/SmtpAuthIntegrationTest.java | 15 +--
.../mailets/configuration/CommonProcessors.java | 99 +++++----------
.../mailets/configuration/MailetContainer.java | 5 +
.../configuration/ProcessorConfiguration.java | 5 +
.../crypto/SMIMEDecryptIntegrationTest.java | 13 +-
.../crypto/SMIMESignIntegrationTest.java | 28 ++--
.../mailets/AmqpForwardAttachmentTest.java | 13 +-
.../transport/mailets/ContactExtractorTest.java | 7 +-
.../mailets/ICSAttachmentWorkflowTest.java | 24 ++--
.../transport/mailets/StripAttachmentTest.java | 9 +-
.../mailets/delivery/LocalDeliveryTest.java | 4 +-
.../mailets/delivery/MailDispatcherTest.java | 12 +-
.../mailets/delivery/MailboxAppenderTest.java | 6 +-
.../mailets/delivery/SieveIntegrationTest.java | 4 +-
.../mailets/delivery/SimpleMailStoreTest.java | 5 +-
.../mailets/delivery/ToRecipientFolderTest.java | 4 +-
.../managesieve/ManageSieveMailetTestCase.java | 5 +-
33 files changed, 277 insertions(+), 447 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
index e0f38f9..c99ff14 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
@@ -292,13 +292,11 @@ public class AutomaticallySentMailDetectorImplTest {
public void isMdnSentAutomaticallyShouldNotThrowOnBodyPartsWithManyLines() throws Exception {
int mime4jDefaultMaxHeaderCount = 1000;
int headerCount = mime4jDefaultMaxHeaderCount + 10;
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.addHeaders()
.setMultipartWithBodyParts(MimeMessageBuilder.bodyPartBuilder()
.addHeaders(Collections.nCopies(headerCount, new MimeMessageBuilder.Header("name", "value")))
- .data("The body part have 1010 headers, which overpass MIME4J default limits")
- .build())
- .build();
+ .data("The body part have 1010 headers, which overpass MIME4J default limits"));
FakeMail fakeMail = FakeMail.builder()
.sender(MailAddressFixture.ANY_AT_JAMES)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index 8a4bcde..beee826 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -30,13 +30,14 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
+
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.apache.mailet.Mail;
import org.apache.james.core.MailAddress;
+import org.apache.mailet.Mail;
import org.apache.mailet.PerRecipientHeaders;
import org.apache.mailet.PerRecipientHeaders.Header;
@@ -50,6 +51,12 @@ import com.google.common.collect.Maps;
public class FakeMail implements Mail {
+ public static FakeMail fromMessage(MimeMessageBuilder message) throws MessagingException {
+ return FakeMail.builder()
+ .mimeMessage(message)
+ .build();
+ }
+
public static FakeMail fromMime(String text, String javaEncodingCharset, String javamailDefaultEncodingCharset) throws MessagingException, UnsupportedEncodingException {
Properties javamailProperties = new Properties();
javamailProperties.setProperty("mail.mime.charset", javamailDefaultEncodingCharset);
@@ -126,6 +133,11 @@ public class FakeMail implements Mail {
return this;
}
+ public Builder mimeMessage(MimeMessageBuilder mimeMessage) throws MessagingException {
+ this.mimeMessage = Optional.of(mimeMessage.build());
+ return this;
+ }
+
public Builder recipients(List<MailAddress> recipients) {
this.recipients.addAll(recipients);
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
index 4c59513..f5a5caf 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
@@ -45,6 +45,7 @@ import javax.mail.util.ByteArrayDataSource;
import org.apache.commons.io.IOUtils;
+import com.github.fge.lambdas.Throwing;
import com.github.steveash.guavate.Guavate;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
@@ -70,11 +71,23 @@ public class MimeMessageBuilder {
return this;
}
+ public MultipartBuilder addBody(BodyPartBuilder bodyPart) throws IOException, MessagingException {
+ this.bodyParts.add(bodyPart.build());
+ return this;
+ }
+
public MultipartBuilder addBodies(BodyPart... bodyParts) {
this.bodyParts.addAll(Arrays.asList(bodyParts));
return this;
}
+ public MultipartBuilder addBodies(BodyPartBuilder... bodyParts) {
+ this.bodyParts.addAll(Arrays.stream(bodyParts)
+ .map(Throwing.function(BodyPartBuilder::build).sneakyThrow())
+ .collect(Guavate.toImmutableList()));
+ return this;
+ }
+
public MimeMultipart build() throws MessagingException {
MimeMultipart multipart = new MimeMultipart();
List<BodyPart> bodyParts = this.bodyParts.build();
@@ -311,6 +324,11 @@ public class MimeMessageBuilder {
return this;
}
+ public MimeMessageBuilder setContent(MultipartBuilder mimeMultipart) throws MessagingException {
+ this.content = Optional.of(mimeMultipart.build());
+ return this;
+ }
+
public MimeMessageBuilder setMultipartWithBodyParts(BodyPart... bobyParts) throws MessagingException {
this.content = Optional.of(MimeMessageBuilder.multipartBuilder()
.addBodies(bobyParts)
@@ -318,6 +336,13 @@ public class MimeMessageBuilder {
return this;
}
+ public MimeMessageBuilder setMultipartWithBodyParts(BodyPartBuilder... bobyParts) throws MessagingException {
+ this.content = Optional.of(MimeMessageBuilder.multipartBuilder()
+ .addBodies(bobyParts)
+ .build());
+ return this;
+ }
+
public MimeMessageBuilder setMultipartWithSubMessage(MimeMessage mimeMessage) throws MessagingException, IOException {
return setMultipartWithBodyParts(
new MimeBodyPart(
@@ -325,6 +350,10 @@ public class MimeMessageBuilder {
IOUtils.toByteArray(mimeMessage.getInputStream())));
}
+ public MimeMessageBuilder setMultipartWithSubMessage(MimeMessageBuilder mimeMessage) throws MessagingException, IOException {
+ return setMultipartWithSubMessage(mimeMessage.build());
+ }
+
public MimeMessageBuilder addHeader(String name, String value) {
this.headers.add(new Header(name, value));
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
index f656c9a..4397c68 100644
--- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
+++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
@@ -31,8 +31,8 @@ import java.util.stream.Collectors;
import javax.mail.MessagingException;
-import org.apache.mailet.Mail;
import org.apache.james.core.MailAddress;
+import org.apache.mailet.Mail;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailetConfig;
@@ -444,8 +444,7 @@ public class ICALToJsonAttributeTest {
.sender(SENDER)
.recipient(recipient)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addFrom(from)
- .build())
+ .addFrom(from))
.attribute(ICALToJsonAttribute.DEFAULT_SOURCE_ATTRIBUTE_NAME, icals)
.attribute(ICALToJsonAttribute.DEFAULT_RAW_SOURCE_ATTRIBUTE_NAME, rawIcals)
.build();
@@ -479,8 +478,7 @@ public class ICALToJsonAttributeTest {
Mail mail = FakeMail.builder()
.sender(SENDER)
.recipient(recipient)
- .mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .build())
+ .mimeMessage(MimeMessageBuilder.defaultMimeMessage())
.attribute(ICALToJsonAttribute.DEFAULT_SOURCE_ATTRIBUTE_NAME, icals)
.attribute(ICALToJsonAttribute.DEFAULT_RAW_SOURCE_ATTRIBUTE_NAME, rawIcals)
.build();
@@ -515,8 +513,7 @@ public class ICALToJsonAttributeTest {
Mail mail = FakeMail.builder()
.recipient(recipient)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addFrom(from)
- .build())
+ .addFrom(from))
.attribute(ICALToJsonAttribute.DEFAULT_SOURCE_ATTRIBUTE_NAME, icals)
.attribute(ICALToJsonAttribute.DEFAULT_RAW_SOURCE_ATTRIBUTE_NAME, rawIcals)
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
index 7546025..99b04f4 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -103,12 +103,11 @@ public class ContactExtractorTest {
@Test
public void serviceShouldAddTheAttribute() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSender(SENDER)
.addToRecipient(TO)
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.sender(new MailAddress(SENDER))
.recipient(new MailAddress(TO))
@@ -123,12 +122,11 @@ public class ContactExtractorTest {
@Test
public void serviceShouldPreserveRecipientsEmailAddress() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSender(SENDER)
.addToRecipient("To <" + TO + ">")
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.sender(new MailAddress(SENDER))
.recipient(new MailAddress(TO))
@@ -143,12 +141,11 @@ public class ContactExtractorTest {
@Test
public void serviceShouldUnscrambleRecipients() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSender(SENDER)
.addToRecipient("=?ISO-8859-1?Q?Beno=EEt_TELLIER?= <te...@linagora.com>")
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.sender(new MailAddress(SENDER))
.recipient(new MailAddress(TO))
@@ -223,12 +220,11 @@ public class ContactExtractorTest {
@Test
public void serviceShouldNotOverwriteSenderWhenDifferentFromField() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.addFrom("other@sender.org")
.addToRecipient("To <" + TO + ">")
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.sender(new MailAddress(SENDER))
.recipient(new MailAddress(TO))
@@ -243,12 +239,11 @@ public class ContactExtractorTest {
@Test
public void serviceShouldNotOverwriteSenderWhenDifferentSenderField() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSender("other@sender.org")
.addToRecipient("To <" + TO + ">")
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.sender(new MailAddress(SENDER))
.recipient(new MailAddress(TO))
@@ -263,11 +258,10 @@ public class ContactExtractorTest {
@Test
public void serviceShouldSkipMessagesWithoutSenderEnvelope() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.addToRecipient("To <" + TO + ">")
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.recipient(new MailAddress(TO))
.build();
@@ -280,11 +274,10 @@ public class ContactExtractorTest {
@Test
public void serviceShouldNotAddTheAttributeWhenNoRecipient() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSender(SENDER)
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.sender(new MailAddress(SENDER))
.build();
@@ -297,11 +290,10 @@ public class ContactExtractorTest {
@Test
public void extractContactsShouldNotThrowWhenNoRecipient() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSender(SENDER)
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
.sender(new MailAddress(SENDER))
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java
index 2b21058..7479385 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesListToMimeHeadersTest.java
@@ -190,8 +190,7 @@ public class MailAttributesListToMimeHeadersTest {
String firstValue = "first value";
FakeMail mail = FakeMail.builder()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(HEADER_NAME1, firstValue)
- .build())
+ .addHeader(HEADER_NAME1, firstValue))
.attribute(MAIL_ATTRIBUTE_NAME1, MAIL_ATTRIBUTE_VALUE1)
.build();
@@ -212,7 +211,7 @@ public class MailAttributesListToMimeHeadersTest {
mailet.init(mailetConfig);
FakeMail mail = FakeMail.builder()
- .mimeMessage(MimeMessageBuilder.mimeMessageBuilder().build())
+ .mimeMessage(MimeMessageBuilder.mimeMessageBuilder())
.attribute(MAIL_ATTRIBUTE_NAME1, 3L)
.attribute(MAIL_ATTRIBUTE_NAME2, MAIL_ATTRIBUTE_VALUE2)
.build();
@@ -235,7 +234,7 @@ public class MailAttributesListToMimeHeadersTest {
String value = "value";
FakeMail mail = FakeMail.builder()
- .mimeMessage(MimeMessageBuilder.mimeMessageBuilder().build())
+ .mimeMessage(MimeMessageBuilder.mimeMessageBuilder())
.attribute(MAIL_ATTRIBUTE_NAME1, ImmutableList.of(3L, value))
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefixTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefixTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefixTest.java
index 2a820da..f6dabe2 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefixTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefixTest.java
@@ -22,7 +22,6 @@ package org.apache.james.transport.mailets;
import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
import org.apache.james.transport.mailets.utils.MimeMessageUtils;
import org.apache.mailet.Mail;
@@ -65,9 +64,8 @@ public class RemoveMimeHeaderByPrefixTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(HEADER_NAME_PREFIX_1, "true")
- .build());
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
+ .addHeader(HEADER_NAME_PREFIX_1, "true"));
mailet.service(mail);
@@ -84,10 +82,9 @@ public class RemoveMimeHeaderByPrefixTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(HEADER_NAME_PREFIX_1, "true")
- .addHeader(HEADER_NAME_PREFIX_2, "true")
- .build());
+ .addHeader(HEADER_NAME_PREFIX_2, "true"));
mailet.service(mail);
@@ -104,10 +101,9 @@ public class RemoveMimeHeaderByPrefixTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(HEADER_NAME_PREFIX_1, "true")
- .addHeader(HEADER_NAME_NO_PREFIX, "true")
- .build());
+ .addHeader(HEADER_NAME_NO_PREFIX, "true"));
mailet.service(mail);
@@ -125,10 +121,9 @@ public class RemoveMimeHeaderByPrefixTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(PREFIX, "true")
- .addHeader(HEADER_NAME_NO_PREFIX, "true")
- .build());
+ .addHeader(HEADER_NAME_NO_PREFIX, "true"));
mailet.service(mail);
@@ -157,10 +152,4 @@ public class RemoveMimeHeaderByPrefixTest {
.build();
mailet.init(mailetConfig);
}
-
- private Mail createMail(MimeMessage message) throws MessagingException {
- return FakeMail.builder()
- .mimeMessage(message)
- .build();
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
index 5482b52..df2fa47 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
import org.apache.mailet.Mail;
import org.apache.mailet.base.GenericMailet;
@@ -66,10 +65,9 @@ public class RemoveMimeHeaderTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(HEADER1, "true")
- .addHeader(HEADER2, "true")
- .build());
+ .addHeader(HEADER2, "true"));
mailet.service(mail);
@@ -85,10 +83,9 @@ public class RemoveMimeHeaderTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(HEADER1, "true")
- .addHeader(HEADER2, "true")
- .build());
+ .addHeader(HEADER2, "true"));
mailet.service(mail);
@@ -105,10 +102,9 @@ public class RemoveMimeHeaderTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(HEADER1, "true")
- .addHeader(HEADER2, "true")
- .build());
+ .addHeader(HEADER2, "true"));
mailet.service(mail);
@@ -124,10 +120,9 @@ public class RemoveMimeHeaderTest {
.build();
mailet.init(mailetConfig);
- Mail mail = createMail(MimeMessageBuilder.mimeMessageBuilder()
+ Mail mail = FakeMail.fromMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(HEADER1, "true")
- .addHeader(HEADER2, "true")
- .build());
+ .addHeader(HEADER2, "true"));
mailet.service(mail);
@@ -160,10 +155,4 @@ public class RemoveMimeHeaderTest {
assertThatThrownBy(() -> mailet.service(mail))
.isInstanceOf(MessagingException.class);
}
-
- private Mail createMail(MimeMessage message) throws MessagingException {
- return FakeMail.builder()
- .mimeMessage(message)
- .build();
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
index a731a86..adcd0c5 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -32,15 +32,14 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import javax.mail.BodyPart;
import javax.mail.MessagingException;
import javax.mail.Part;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import org.apache.james.transport.mailets.StripAttachment.OutputFileName;
import org.apache.commons.io.IOUtils;
+import org.apache.james.transport.mailets.StripAttachment.OutputFileName;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetException;
@@ -101,22 +100,16 @@ public class StripAttachmentTest {
@Test
public void serviceShouldNotModifyMailWhenNotMultipart() throws MessagingException, IOException {
Mailet mailet = initMailet();
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSubject("test")
- .setText("simple text")
- .build();
+ .setText("simple text");
- MimeMessage expectedMessage = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder expectedMessage = MimeMessageBuilder.mimeMessageBuilder()
.setSubject("test")
- .setText("simple text")
- .build();
+ .setText("simple text");
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .build();
- Mail expectedMail = FakeMail.builder()
- .mimeMessage(expectedMessage)
- .build();
+ Mail mail = FakeMail.fromMessage(message);
+ Mail expectedMail = FakeMail.fromMessage(expectedMessage);
mailet.service(mail);
@@ -129,18 +122,14 @@ public class StripAttachmentTest {
Mailet mailet = initMailet();
String expectedAttachmentContent = EXPECTED_ATTACHMENT_CONTENT;
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
createAttachmentBodyPart(expectedAttachmentContent, "10.tmp", TEXT_HEADERS),
- createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "temp.zip", TEXT_HEADERS))
- .build();
+ createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "temp.zip", TEXT_HEADERS));
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .build();
+ Mail mail = FakeMail.fromMessage(message);
mailet.service(mail);
@@ -165,20 +154,16 @@ public class StripAttachmentTest {
mailet.init(mci);
String expectedFileName = "10.ical";
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
createAttachmentBodyPart("content", expectedFileName, CALENDAR_HEADERS),
createAttachmentBodyPart("other content", "11.ical", TEXT_HEADERS),
- createAttachmentBodyPart("<p>html</p>", "index.html", HTML_HEADERS))
- .build();
+ createAttachmentBodyPart("<p>html</p>", "index.html", HTML_HEADERS));
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .build();
+ Mail mail = FakeMail.fromMessage(message);
mailet.service(mail);
@@ -187,13 +172,12 @@ public class StripAttachmentTest {
assertThat(removedAttachments).containsOnly(expectedFileName);
}
- private BodyPart createAttachmentBodyPart(String body, String fileName, MimeMessageBuilder.Header... headers) throws MessagingException, IOException {
+ private MimeMessageBuilder.BodyPartBuilder createAttachmentBodyPart(String body, String fileName, MimeMessageBuilder.Header... headers) throws MessagingException, IOException {
return MimeMessageBuilder.bodyPartBuilder()
.data(body)
.addHeaders(headers)
.disposition(MimeBodyPart.ATTACHMENT)
- .filename(fileName)
- .build();
+ .filename(fileName);
}
@Test
@@ -209,18 +193,14 @@ public class StripAttachmentTest {
mailet.init(mci);
String expectedAttachmentContent = EXPECTED_ATTACHMENT_CONTENT;
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
createAttachmentBodyPart(expectedAttachmentContent, "temp_filname.tmp", TEXT_HEADERS),
- createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "winmail.dat", TEXT_HEADERS))
- .build();
+ createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "winmail.dat", TEXT_HEADERS));
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .build();
+ Mail mail = FakeMail.fromMessage(message);
mailet.service(mail);
@@ -246,19 +226,15 @@ public class StripAttachmentTest {
Mailet mailet = initMailet();
String expectedAttachmentContent = EXPECTED_ATTACHMENT_CONTENT;
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
createAttachmentBodyPart(expectedAttachmentContent,
"=?iso-8859-15?Q?=E9_++++Pubblicit=E0_=E9_vietata____Milano9052.tmp?=", TEXT_HEADERS),
- createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "temp.zip", TEXT_HEADERS))
- .build();
+ createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "temp.zip", TEXT_HEADERS));
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .build();
+ Mail mail = FakeMail.fromMessage(message);
mailet.service(mail);
@@ -289,18 +265,14 @@ public class StripAttachmentTest {
mailet.init(mci);
String expectedKey = "10.tmp";
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
createAttachmentBodyPart(EXPECTED_ATTACHMENT_CONTENT, expectedKey, TEXT_HEADERS),
- createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "temp.zip", TEXT_HEADERS))
- .build();
+ createAttachmentBodyPart("\u0014\u00A3\u00E1\u00E2\u00E4", "temp.zip", TEXT_HEADERS));
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .build();
+ Mail mail = FakeMail.fromMessage(message);
mailet.service(mail);
@@ -326,17 +298,13 @@ public class StripAttachmentTest {
mailet.init(mci);
String expectedKey = "invite.tmp";
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
- createAttachmentBodyPart(EXPECTED_ATTACHMENT_CONTENT, "=?US-ASCII?Q?" + expectedKey + "?=", TEXT_HEADERS))
- .build();
+ .data("simple text"),
+ createAttachmentBodyPart(EXPECTED_ATTACHMENT_CONTENT, "=?US-ASCII?Q?" + expectedKey + "?=", TEXT_HEADERS));
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .build();
+ Mail mail = FakeMail.fromMessage(message);
mailet.service(mail);
@@ -574,8 +542,7 @@ public class StripAttachmentTest {
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe.tmp")
- .build())
+ .filename("removeMe.tmp"))
.build();
Mail mail = mock(Mail.class);
//When
@@ -598,8 +565,7 @@ public class StripAttachmentTest {
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe.tmp")
- .build())
+ .filename("removeMe.tmp"))
.build();
Mail mail = mock(Mail.class);
@@ -625,11 +591,9 @@ public class StripAttachmentTest {
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe.tmp")
- .build(),
+ .filename("removeMe.tmp"),
MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe.tmp")
- .build())
+ .filename("removeMe.tmp"))
.build();
Mail mail = FakeMail.builder().build();
@@ -660,11 +624,9 @@ public class StripAttachmentTest {
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe1.tmp")
- .build(),
+ .filename("removeMe1.tmp"),
MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe2.tmp")
- .build())
+ .filename("removeMe2.tmp"))
.build();
Mail mail = FakeMail.builder().build();
@@ -696,9 +658,7 @@ public class StripAttachmentTest {
MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe.tmp")
- .build())
- .build())
+ .filename("removeMe.tmp")))
.build();
Mail mail = mock(Mail.class);
//When
@@ -724,9 +684,7 @@ public class StripAttachmentTest {
MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .filename("dontRemoveMe.other")
- .build())
- .build())
+ .filename("dontRemoveMe.other")))
.build();
Mail mail = mock(Mail.class);
//When
@@ -749,8 +707,7 @@ public class StripAttachmentTest {
MimeMultipart mimeMultipart = MimeMessageBuilder.multipartBuilder()
.addBody(MimeMessageBuilder.bodyPartBuilder()
- .filename("removeMe.tmp")
- .build())
+ .filename("removeMe.tmp"))
.build();
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setContent(mimeMultipart)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java
index 3d25483..c326de3 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java
@@ -21,8 +21,8 @@ package org.apache.james.transport.mailets;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.mailet.Mail;
import org.apache.james.core.MailAddress;
+import org.apache.mailet.Mail;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
@@ -63,8 +63,7 @@ public class UseHeaderRecipientsTest {
FakeMail fakeMail = FakeMail.builder()
.recipients(MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.ANY_AT_JAMES2)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addToRecipient(RECIPIENT1, RECIPIENT2)
- .build())
+ .addToRecipient(RECIPIENT1, RECIPIENT2))
.build();
testee.service(fakeMail);
@@ -80,8 +79,7 @@ public class UseHeaderRecipientsTest {
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.addToRecipient(RECIPIENT1)
.addCcRecipient(RECIPIENT2)
- .addBccRecipient(RECIPIENT3)
- .build())
+ .addBccRecipient(RECIPIENT3))
.build();
testee.service(fakeMail);
@@ -95,8 +93,7 @@ public class UseHeaderRecipientsTest {
FakeMail fakeMail = FakeMail.builder()
.recipients(MailAddressFixture.ANY_AT_JAMES)
- .mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .build())
+ .mimeMessage(MimeMessageBuilder.defaultMimeMessage())
.build();
testee.service(fakeMail);
@@ -109,8 +106,7 @@ public class UseHeaderRecipientsTest {
public void serviceShouldGhostEmail() throws Exception {
FakeMail fakeMail = FakeMail.builder()
.recipients(MailAddressFixture.ANY_AT_JAMES)
- .mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .build())
+ .mimeMessage(MimeMessageBuilder.defaultMimeMessage())
.build();
testee.service(fakeMail);
@@ -126,8 +122,7 @@ public class UseHeaderRecipientsTest {
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.addToRecipient(RECIPIENT1)
.addCcRecipient(RECIPIENT2)
- .addBccRecipient(RECIPIENT3)
- .build())
+ .addBccRecipient(RECIPIENT3))
.build();
testee.service(fakeMail);
@@ -146,8 +141,7 @@ public class UseHeaderRecipientsTest {
FakeMail fakeMail = FakeMail.builder()
.recipients(mailAddress1)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addToRecipient("invalid")
- .build())
+ .addToRecipient("invalid"))
.build();
testee.service(fakeMail);
@@ -158,8 +152,7 @@ public class UseHeaderRecipientsTest {
FakeMail fakeMail = FakeMail.builder()
.recipients()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addToRecipient(RECIPIENT1, RECIPIENT2)
- .build())
+ .addToRecipient(RECIPIENT1, RECIPIENT2))
.build();
testee.service(fakeMail);
@@ -173,8 +166,7 @@ public class UseHeaderRecipientsTest {
FakeMail fakeMail = FakeMail.builder()
.recipients()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addToRecipient("APACHE" + "<" + UseHeaderRecipientsTest.RECIPIENT1 + ">")
- .build())
+ .addToRecipient("APACHE" + "<" + UseHeaderRecipientsTest.RECIPIENT1 + ">"))
.build();
testee.service(fakeMail);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderWithPrefixTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderWithPrefixTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderWithPrefixTest.java
index 90f2978..734e798 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderWithPrefixTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderWithPrefixTest.java
@@ -61,8 +61,7 @@ public class HasHeaderWithPrefixTest {
Mail mail = FakeMail.builder()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(HEADER_NAME_PREFIX_1, "true")
- .build())
+ .addHeader(HEADER_NAME_PREFIX_1, "true"))
.recipients(MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.OTHER_AT_JAMES2)
.build();
@@ -80,8 +79,7 @@ public class HasHeaderWithPrefixTest {
Mail mail = FakeMail.builder()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(PREFIX, "true")
- .build())
+ .addHeader(PREFIX, "true"))
.recipients(MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.OTHER_AT_JAMES2)
.build();
@@ -99,8 +97,7 @@ public class HasHeaderWithPrefixTest {
Mail mail = FakeMail.builder()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(HEADER_NAME_NO_PREFIX, "true")
- .build())
+ .addHeader(HEADER_NAME_NO_PREFIX, "true"))
.recipients(MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.OTHER_AT_JAMES2)
.build();
@@ -119,8 +116,7 @@ public class HasHeaderWithPrefixTest {
Mail mail = FakeMail.builder()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.addHeader(HEADER_NAME_PREFIX_1, "true")
- .addHeader(HEADER_NAME_NO_PREFIX, "true")
- .build())
+ .addHeader(HEADER_NAME_NO_PREFIX, "true"))
.recipients(MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.OTHER_AT_JAMES2)
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
index 70a80b2..f6ab324 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
@@ -21,8 +21,6 @@ package org.apache.james.transport.matchers;
import static org.assertj.core.api.Assertions.assertThat;
-import javax.mail.internet.MimeMessage;
-
import org.apache.james.core.MailAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
@@ -52,23 +50,19 @@ public class HasMimeTypeTest {
.condition(MIME_TYPES)
.build());
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
.data("simple text")
- .disposition("text")
- .build(),
+ .disposition("text"),
MimeMessageBuilder.bodyPartBuilder()
.filename("text_file.txt")
- .disposition("attachment")
- .build(),
+ .disposition("attachment"),
MimeMessageBuilder.bodyPartBuilder()
.type("application/zip")
.filename("zip_file.zip")
- .disposition("attachment")
- .build())
- .setSubject("test")
- .build();
+ .disposition("attachment"))
+ .setSubject("test");
Mail mail = FakeMail.builder()
.mimeMessage(message)
@@ -86,23 +80,19 @@ public class HasMimeTypeTest {
.condition(NON_MATCHING_MIME_TYPES)
.build());
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
.data("simple text")
- .disposition("text")
- .build(),
+ .disposition("text"),
MimeMessageBuilder.bodyPartBuilder()
.filename("text_file.txt")
- .disposition("attachment")
- .build(),
+ .disposition("attachment"),
MimeMessageBuilder.bodyPartBuilder()
.type("application/zip")
.filename("zip_file.zip")
- .disposition("attachment")
- .build())
- .setSubject("test")
- .build();
+ .disposition("attachment"))
+ .setSubject("test");
Mail mail = FakeMail.builder()
.mimeMessage(message)
@@ -120,10 +110,9 @@ public class HasMimeTypeTest {
.condition("text/md, text/html")
.build());
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setText("content <b>in</b> <i>HTML</i>", "text/html")
- .setSubject("test")
- .build();
+ .setSubject("test");
Mail mail = FakeMail.builder()
.mimeMessage(message)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java
index 691b27d..c190387 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java
@@ -117,9 +117,7 @@ public class TooManyLinesTest {
FakeMail fakeMail = FakeMail.builder()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(MimeMessageBuilder.bodyPartBuilder()
- .data("content")
- .build())
- .build())
+ .data("content")))
.build();
Collection<MailAddress> result = testee.match(fakeMail);
@@ -133,10 +131,9 @@ public class TooManyLinesTest {
FakeMail fakeMail = FakeMail.builder()
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .setMultipartWithBodyParts(MimeMessageBuilder.bodyPartBuilder()
- .data("1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11")
- .build())
- .build())
+ .setMultipartWithBodyParts(
+ MimeMessageBuilder.bodyPartBuilder()
+ .data("1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11")))
.build();
Collection<MailAddress> result = testee.match(fakeMail);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index f8daddb..919fb35 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
@@ -263,34 +263,29 @@ public class BounceIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIs.class)
.matcherCondition(BOUNCE_RECEIVER)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIs.class)
.matcherCondition(POSTMASTER)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")
- .build())
+ .addProperty("processor", "bounces"))
.build();
}
public static ProcessorConfiguration bounces(MailetConfiguration.Builder redirectionMailetConfiguration) {
return ProcessorConfiguration.builder()
.state("bounces")
- .addMailet(redirectionMailetConfiguration.build())
+ .addMailet(redirectionMailetConfiguration)
.build();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index abdac8b..9df8289 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -280,12 +280,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
@@ -295,9 +293,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProperty("maxDnsProblemRetries", "0")
.addProperty("deliveryThreads", "2")
.addProperty("sendpartial", "true")
- .addProperty("gateway", gatewayProperty)
- .build())
- .build())
+ .addProperty("gateway", gatewayProperty)))
.addProcessor(CommonProcessors.bounces())
.build());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
@@ -376,18 +372,15 @@ public class GatewayRemoteDeliveryIntegrationTest {
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(PostmasterAlias.class)
- .build())
+ .mailet(PostmasterAlias.class))
.addMailet(MailetConfiguration.builder()
.matcher(RelayLimit.class)
.matcherCondition("30")
- .mailet(Null.class)
- .build())
+ .mailet(Null.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.build();
}
@@ -398,8 +391,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
@@ -410,8 +402,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProperty("deliveryThreads", "2")
.addProperty("sendpartial", "true")
.addProperty("bounceProcessor", "bounces")
- .addProperty("gateway", gatewayProperty)
- .build())
+ .addProperty("gateway", gatewayProperty))
.build();
}
@@ -422,12 +413,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
@@ -438,8 +427,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProperty("deliveryThreads", "2")
.addProperty("sendpartial", "true")
.addProperty("bounceProcessor", "bounces")
- .addProperty("gateway", gatewayProperty)
- .build())
+ .addProperty("gateway", gatewayProperty))
.build();
}
@@ -450,8 +438,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
@@ -461,8 +448,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProperty("maxDnsProblemRetries", "0")
.addProperty("deliveryThreads", "2")
.addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
- .build())
+ .addProperty("bounceProcessor", "bounces"))
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index e70d4e4..e5750bb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -79,7 +79,7 @@ public class NetworkMatcherIntegrationTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
.threads(5)
- .addProcessor(rootProcessor.build())
+ .addProcessor(rootProcessor)
.addProcessor(CommonProcessors.error())
.addProcessor(deliverOnlyTransport())
.build();
@@ -100,21 +100,18 @@ public class NetworkMatcherIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.build();
}
- private MailetConfiguration toRepository() {
+ private MailetConfiguration.Builder toRepository() {
return MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", DROPPED_MAILS)
- .build();
+ .addProperty("repositoryPath", DROPPED_MAILS);
}
@After
@@ -130,8 +127,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -154,8 +150,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrNotInNetwork.class)
.matcherCondition("172.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -178,8 +173,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.0.0.0/2")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -202,8 +196,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.0.4.108/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -226,8 +219,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("127.255.255.255/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -250,8 +242,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("126.0.0.0/4")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -274,8 +265,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrInNetwork.class)
.matcherCondition("172.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
@@ -300,8 +290,7 @@ public class NetworkMatcherIntegrationTest {
.matcher(RemoteAddrNotInNetwork.class)
.matcherCondition("127.0.0.0/8")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/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 070eb09..19393a7 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
@@ -71,13 +71,11 @@ public class SmtpAuthIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")
- .build())
+ .addProperty("processor", "bounces"))
.build();
MailetContainer mailetContainer = MailetContainer.builder()
@@ -113,12 +111,10 @@ public class SmtpAuthIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.build();
}
@@ -129,8 +125,7 @@ public class SmtpAuthIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", DROPPED_MAILS)
- .build())
+ .addProperty("repositoryPath", DROPPED_MAILS))
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index 7e5938e..9f52fc3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -55,53 +55,44 @@ public class CommonProcessors {
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(PostmasterAlias.class)
- .build())
+ .mailet(PostmasterAlias.class))
.addMailet(MailetConfiguration.builder()
.matcher(RelayLimit.class)
.matcherCondition("30")
- .mailet(Null.class)
- .build())
+ .mailet(Null.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIs.class)
.matcherCondition("sievemanager@james.linagora.com")
.mailet(ToProcessor.class)
- .addProperty("processor", "sieve-manager-check")
- .build())
+ .addProperty("processor", "sieve-manager-check"))
.addMailet(MailetConfiguration.builder()
.matcher(HasMailAttribute.class)
.matcherCondition("spamChecked")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(SetMailAttribute.class)
- .addProperty("spamChecked", "true")
- .build())
+ .addProperty("spamChecked", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(MailetConfiguration.builder()
.matcher(InSpammerBlacklist.class)
.matcherCondition("query.bondedsender.org.")
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(MailetConfiguration.builder()
.matcher(InSpammerBlacklist.class)
.matcherCondition("dnsbl.njabl.org.")
.mailet(ToProcessor.class)
.addProperty("processor", "spam")
- .addProperty("notice", "550 Requested action not taken: rejected - see http://njabl.org/")
- .build())
+ .addProperty("notice", "550 Requested action not taken: rejected - see http://njabl.org/"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.build();
}
@@ -111,13 +102,11 @@ public class CommonProcessors {
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(Bounce.class)
- .build())
+ .mailet(Bounce.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", ERROR_REPOSITORY)
- .build())
+ .addProperty("repositoryPath", ERROR_REPOSITORY))
.build();
}
@@ -129,40 +118,32 @@ public class CommonProcessors {
.matcher(SMTPAuthSuccessful.class)
.mailet(SetMimeHeader.class)
.addProperty("name", "X-UserIsAuth")
- .addProperty("value", "true")
- .build())
+ .addProperty("value", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(HasMailAttribute.class)
.matcherCondition("org.apache.james.SMIMECheckSignature")
.mailet(SetMimeHeader.class)
.addProperty("name", "X-WasSigned")
- .addProperty("value", "true")
- .build())
+ .addProperty("value", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(RecipientRewriteTable.class)
- .build())
+ .mailet(RecipientRewriteTable.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(Sieve.class)
- .build())
+ .mailet(Sieve.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(AddDeliveredToHeader.class)
- .build())
+ .mailet(AddDeliveredToHeader.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(RemoteDelivery.class)
@@ -172,13 +153,11 @@ public class CommonProcessors {
.addProperty("maxDnsProblemRetries", "0")
.addProperty("deliveryThreads", "10")
.addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
- .build())
+ .addProperty("bounceProcessor", "bounces"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "relay-denied")
- .build())
+ .addProperty("processor", "relay-denied"))
.build();
}
@@ -189,8 +168,7 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", "file://var/mail/spam/")
- .build())
+ .addProperty("repositoryPath", "file://var/mail/spam/"))
.build();
}
@@ -201,13 +179,11 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Bounce.class)
- .addProperty("attachment", "none")
- .build())
+ .addProperty("attachment", "none"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", "file://var/mail/address-error/")
- .build())
+ .addProperty("repositoryPath", "file://var/mail/address-error/"))
.build();
}
@@ -218,14 +194,12 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Bounce.class)
- .addProperty("attachment", "none")
- .build())
+ .addProperty("attachment", "none"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
.addProperty("repositoryPath", "file://var/mail/relay-denied/")
- .addProperty("notice", "Warning: You are sending an e-mail to a remote server. You must be authentified to perform such an operation")
- .build())
+ .addProperty("notice", "Warning: You are sending an e-mail to a remote server. You must be authentified to perform such an operation"))
.build();
}
@@ -236,8 +210,7 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(DSNBounce.class)
- .addProperty("passThrough", "false")
- .build())
+ .addProperty("passThrough", "false"))
.build();
}
@@ -248,8 +221,7 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "sieve-manager")
- .build())
+ .addProperty("processor", "sieve-manager"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Bounce.class)
@@ -257,12 +229,10 @@ public class CommonProcessors {
.addProperty("attachment", "none")
.addProperty("passThrough", "false")
.addProperty("prefix", "[REJECTED]")
- .addProperty("notice", "You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager.")
- .build())
+ .addProperty("notice", "You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager."))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(Null.class)
- .build())
+ .mailet(Null.class))
.build();
}
@@ -273,17 +243,14 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(SetMailAttribute.class)
- .addProperty(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, "true")
- .build())
+ .addProperty(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, "true"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ManageSieveMailet.class)
- .addProperty("helpURL", "file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt")
- .build())
+ .addProperty("helpURL", "file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(Null.class)
- .build())
+ .mailet(Null.class))
.build();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
index ae71091..7dfc216 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -57,6 +57,11 @@ public class MailetContainer implements SerializableAsXml {
return this;
}
+ public Builder addProcessor(ProcessorConfiguration.Builder processorConfiguration) {
+ this.processors.add(processorConfiguration.build());
+ return this;
+ }
+
public MailetContainer build() {
Preconditions.checkState(!Strings.isNullOrEmpty(postmaster), "'postmaster' is mandatory");
Preconditions.checkState(threads > 0, "'threads' should be greater than 0");
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
index e1de38d..5faa8be 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
@@ -61,6 +61,11 @@ public class ProcessorConfiguration implements SerializableAsXml {
return this;
}
+ public Builder addMailet(MailetConfiguration.Builder mailetConfiguration) {
+ this.mailets.add(mailetConfiguration.build());
+ return this;
+ }
+
public ProcessorConfiguration build() {
Preconditions.checkState(!Strings.isNullOrEmpty(state), "'state' is mandatory");
return new ProcessorConfiguration(state, enableJmx.orElse(false), mailets.build());
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/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 d8084dc..05e6318 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
@@ -83,25 +83,20 @@ public class SMIMEDecryptIntegrationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.mailet(SMIMEDecrypt.class)
.matcher(All.class)
.addProperty("keyStoreFileName", temporaryFolder.getRoot().getAbsoluteFile().getAbsolutePath() + "/conf/smime.p12")
.addProperty("keyStorePassword", "secret")
.addProperty("keyStoreType", "PKCS12")
- .addProperty("debug", "true")
- .build())
+ .addProperty("debug", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
+ .mailet(LocalDelivery.class)))
.build();
jamesServer = TemporaryJamesServer.builder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[12/44] james-project git commit: JAMES-2267 Simplify some mailet
configuration
Posted by bt...@apache.org.
JAMES-2267 Simplify some mailet configuration
Some mailets were not needed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e0251a0f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e0251a0f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e0251a0f
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: e0251a0f173e55b06ce0741622460510b27678c0
Parents: 91e8871
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 14:01:57 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:18 2018 +0700
----------------------------------------------------------------------
.../GatewayRemoteDeliveryIntegrationTest.java | 10 -------
.../crypto/SMIMEDecryptIntegrationTest.java | 2 --
.../crypto/SMIMESignIntegrationTest.java | 29 +-------------------
.../transport/mailets/GroupMappingTest.java | 8 ------
4 files changed, 1 insertion(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e0251a0f/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index a2ae2e9..9c396d9 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -40,14 +40,11 @@ import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.Null;
-import org.apache.james.transport.mailets.PostmasterAlias;
import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
-import org.apache.james.transport.matchers.RelayLimit;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
@@ -371,13 +368,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(PostmasterAlias.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RelayLimit.class)
- .matcherCondition("30")
- .mailet(Null.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
.mailet(ToProcessor.class)
.addProperty("processor", "transport"))
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/e0251a0f/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 c2894bd..ef7cd83 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
@@ -52,8 +52,6 @@ import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
public class SMIMEDecryptIntegrationTest {
-
-
private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int IMAP_PORT = 1143;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e0251a0f/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 90d01a4..391dfe0 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
@@ -33,15 +33,10 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RecipientRewriteTable;
-import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.transport.mailets.SMIMESign;
import org.apache.james.transport.mailets.SetMimeHeader;
-import org.apache.james.transport.mailets.ToProcessor;
-import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.HasMailAttribute;
import org.apache.james.transport.matchers.RecipientIsLocal;
-import org.apache.james.transport.matchers.SMTPAuthSuccessful;
import org.apache.james.transport.matchers.SenderIsLocal;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.apache.james.utils.DataProbeImpl;
@@ -83,11 +78,6 @@ public class SMIMESignIntegrationTest {
.addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
- .matcher(SMTPAuthSuccessful.class)
- .mailet(SetMimeHeader.class)
- .addProperty("name", "X-UserIsAuth")
- .addProperty("value", "true"))
- .addMailet(MailetConfiguration.builder()
.matcher(HasMailAttribute.class)
.matcherCondition("org.apache.james.SMIMECheckSignature")
.mailet(SetMimeHeader.class)
@@ -95,9 +85,6 @@ public class SMIMESignIntegrationTest {
.addProperty("value", "true"))
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RecipientRewriteTable.class))
- .addMailet(MailetConfiguration.builder()
.mailet(SMIMESign.class)
.matcher(SenderIsLocal.class)
.addProperty("keyStoreFileName", temporaryFolder.getRoot().getAbsoluteFile().getAbsolutePath() + "/conf/smime.p12")
@@ -106,21 +93,7 @@ public class SMIMESignIntegrationTest {
.addProperty("debug", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(SMTPAuthSuccessful.class)
- .mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
- .addProperty("delayTime", "5000, 100000, 500000")
- .addProperty("maxRetries", "25")
- .addProperty("maxDnsProblemRetries", "0")
- .addProperty("deliveryThreads", "10")
- .addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", "relay-denied")))
+ .mailet(LocalDelivery.class)))
.addProcessor(CommonProcessors.spam())
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
http://git-wip-us.apache.org/repos/asf/james-project/blob/e0251a0f/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 8419cd3..a2be7f2 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
@@ -43,7 +43,6 @@ import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.RelayLimit;
-import org.apache.james.transport.matchers.SMTPAuthSuccessful;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
@@ -111,17 +110,10 @@ public class GroupMappingTest {
.addProcessor(ProcessorConfiguration.root()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(PostmasterAlias.class))
- .addMailet(MailetConfiguration.builder()
.matcher(RelayLimit.class)
.matcherCondition("30")
.mailet(Null.class))
.addMailet(MailetConfiguration.builder()
- .matcher(SMTPAuthSuccessful.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
- .addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[09/44] james-project git commit: JAMES-2267 MailetContainer
integration: Provide a default value for Mailet container configuration
Posted by bt...@apache.org.
JAMES-2267 MailetContainer integration: Provide a default value for Mailet container configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/91e88710
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/91e88710
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/91e88710
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 91e887105453480c0e8644501f0b08563c8d7dd2
Parents: a537bce
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 13:56:26 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:51 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 15 +----
.../james/mailets/BounceIntegrationTest.java | 68 +++++++++++---------
.../mailets/CommonMailetConfigurationTest.java | 15 +----
.../GatewayRemoteDeliveryIntegrationTest.java | 33 ++++++----
.../mailets/NetworkMatcherIntegrationTest.java | 12 ++--
.../RecipientRewriteTableIntegrationTest.java | 15 +----
.../org/apache/james/mailets/SieveDelivery.java | 15 +----
.../james/mailets/SmtpAuthIntegrationTest.java | 3 +-
.../james/mailets/TemporaryJamesServer.java | 28 +++++++-
.../crypto/SMIMEDecryptIntegrationTest.java | 3 +-
.../crypto/SMIMESignIntegrationTest.java | 3 +-
.../james/smtp/SmtpAuthorizedAddressesTest.java | 3 +-
.../james/smtp/SmtpBracketEnforcementTest.java | 3 +-
.../smtp/SmtpIdentityVerificationTest.java | 3 +-
.../james/smtp/SmtpSizeLimitationTest.java | 3 +-
.../mailets/AmqpForwardAttachmentTest.java | 3 +-
.../transport/mailets/ContactExtractorTest.java | 3 +-
.../transport/mailets/GroupMappingTest.java | 3 +-
.../mailets/ICSAttachmentWorkflowTest.java | 3 +-
.../transport/mailets/StripAttachmentTest.java | 3 +-
20 files changed, 115 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index 662a6df..e281064 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -20,8 +20,6 @@
package org.apache.james.mailets;
import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailets.configuration.CommonProcessors;
-import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.AddDeliveredToHeader;
@@ -54,18 +52,7 @@ public class AddDeliveredToHeaderTest {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(CommonProcessors.transport())
- .addProcessor(CommonProcessors.spam())
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck())
- .build();
-
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with()
.pollInterval(slowPacedPollInterval)
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 5c65644..41c642a 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
@@ -89,11 +89,12 @@ public class BounceIntegrationTest {
public void dsnBounceMailetShouldDeliverBounce() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder,
- generateMailetContainerConfiguration(MailetConfiguration.builder()
+ .withMailetContainer(
+ generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(DSNBounce.class)
- .addProperty("passThrough", "false")));
+ .addProperty("passThrough", "false")))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -113,11 +114,12 @@ public class BounceIntegrationTest {
public void bounceMailetShouldDeliverBounce() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder,
- generateMailetContainerConfiguration(MailetConfiguration.builder()
+ .withMailetContainer(
+ generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Bounce.class)
- .addProperty("passThrough", "false")));
+ .addProperty("passThrough", "false")))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -137,12 +139,12 @@ public class BounceIntegrationTest {
public void forwardMailetShouldDeliverBounce() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder,
- generateMailetContainerConfiguration(MailetConfiguration.builder()
+ .withMailetContainer(generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Forward.class)
.addProperty("forwardTo", BOUNCE_RECEIVER)
- .addProperty("passThrough", "false")));
+ .addProperty("passThrough", "false")))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -162,12 +164,13 @@ public class BounceIntegrationTest {
public void redirectMailetShouldDeliverBounce() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder,
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Redirect.class)
- .addProperty("recipients", BOUNCE_RECEIVER)
- .addProperty("passThrough", "false")));
+ .withMailetContainer(
+ generateMailetContainerConfiguration(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(Redirect.class)
+ .addProperty("recipients", BOUNCE_RECEIVER)
+ .addProperty("passThrough", "false")))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -187,12 +190,13 @@ public class BounceIntegrationTest {
public void resendMailetShouldDeliverBounce() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder,
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Resend.class)
- .addProperty("recipients", BOUNCE_RECEIVER)
- .addProperty("passThrough", "false")));
+ .withMailetContainer(
+ generateMailetContainerConfiguration(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(Resend.class)
+ .addProperty("recipients", BOUNCE_RECEIVER)
+ .addProperty("passThrough", "false")))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -212,11 +216,12 @@ public class BounceIntegrationTest {
public void notifySenderMailetShouldDeliverBounce() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder,
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(NotifySender.class)
- .addProperty("passThrough", "false")));
+ .withMailetContainer(
+ generateMailetContainerConfiguration(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(NotifySender.class)
+ .addProperty("passThrough", "false")))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -236,11 +241,12 @@ public class BounceIntegrationTest {
public void notifyPostmasterMailetShouldDeliverBounce() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder,
- generateMailetContainerConfiguration(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(NotifyPostmaster.class)
- .addProperty("passThrough", "false")));
+ .withMailetContainer(
+ generateMailetContainerConfiguration(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(NotifyPostmaster.class)
+ .addProperty("passThrough", "false")))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 27c94c2..89409a2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -20,8 +20,6 @@
package org.apache.james.mailets;
import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailets.configuration.CommonProcessors;
-import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
@@ -53,18 +51,7 @@ public class CommonMailetConfigurationTest {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(CommonProcessors.transport())
- .addProcessor(CommonProcessors.spam())
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck())
- .build();
-
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 37458f2..a2ae2e9 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -130,7 +130,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder, generateMailetContainerConfiguration(gatewayProperty));
+ .withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -149,7 +150,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder, generateMailetContainerConfiguration(gatewayProperty));
+ .withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -168,7 +170,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder, generateMailetContainerConfiguration(gatewayProperty));
+ .withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -187,7 +190,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder, generateMailetContainerConfiguration(gatewayProperty));
+ .withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -210,7 +214,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .build(temporaryFolder, generateMailetContainerConfiguration(gatewayProperty));
+ .withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -237,13 +242,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .build(temporaryFolder, MailetContainer.builder()
+ .withMailetContainer(MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
- .addProcessor(CommonProcessors.bounces())
- .build());
+ .addProcessor(CommonProcessors.bounces()))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -268,7 +273,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .build(temporaryFolder, MailetContainer.builder()
+ .withMailetContainer(MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
@@ -291,8 +296,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProperty("deliveryThreads", "2")
.addProperty("sendpartial", "true")
.addProperty("gateway", gatewayProperty)))
- .addProcessor(CommonProcessors.bounces())
- .build());
+ .addProcessor(CommonProcessors.bounces()))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
@@ -316,13 +321,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .build(temporaryFolder, MailetContainer.builder()
+ .withMailetContainer(MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(directResolutionTransport())
- .addProcessor(CommonProcessors.bounces())
- .build());
+ .addProcessor(CommonProcessors.bounces()))
+ .build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 68af424..9d9b0ce 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -75,15 +75,13 @@ public class NetworkMatcherIntegrationTest {
}
private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(rootProcessor)
- .addProcessor(CommonProcessors.error())
- .addProcessor(deliverOnlyTransport())
- .build();
-
TemporaryJamesServer temporaryJamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(rootProcessor)
+ .addProcessor(CommonProcessors.error())
+ .addProcessor(deliverOnlyTransport()))
+ .build(temporaryFolder);
DataProbe dataProbe = temporaryJamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index 671a6b3..d5eef85 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -20,8 +20,6 @@
package org.apache.james.mailets;
import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailets.configuration.CommonProcessors;
-import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
@@ -64,18 +62,7 @@ public class RecipientRewriteTableIntegrationTest {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(CommonProcessors.transport())
- .addProcessor(CommonProcessors.spam())
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck())
- .build();
-
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 bc9b77b..07dbae4 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,8 +21,6 @@ package org.apache.james.mailets;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.store.probe.MailboxProbe;
-import org.apache.james.mailets.configuration.CommonProcessors;
-import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.modules.protocols.SieveProbeImpl;
import org.apache.james.probe.DataProbe;
@@ -55,18 +53,7 @@ public class SieveDelivery {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(CommonProcessors.transport())
- .addProcessor(CommonProcessors.spam())
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck())
- .build();
-
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 6c73a27..5b9b612 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
@@ -86,7 +86,8 @@ public class SmtpAuthIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
dataProbe.addUser(FROM, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index ebbe397..5e47f0e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -35,6 +35,7 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.io.IOUtils;
import org.apache.james.GuiceJamesServer;
import org.apache.james.MemoryJamesServerMain;
+import org.apache.james.mailets.configuration.CommonProcessors;
import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.modules.TestJMAPServerModule;
@@ -48,15 +49,28 @@ import com.google.inject.Module;
public class TemporaryJamesServer {
+ public static final MailetContainer DEFAUL_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
+ .addProcessor(CommonProcessors.root())
+ .addProcessor(CommonProcessors.error())
+ .addProcessor(CommonProcessors.transport())
+ .addProcessor(CommonProcessors.spam())
+ .addProcessor(CommonProcessors.localAddressError())
+ .addProcessor(CommonProcessors.relayDenied())
+ .addProcessor(CommonProcessors.bounces())
+ .addProcessor(CommonProcessors.sieveManagerCheck())
+ .build();
+
public static class Builder {
private ImmutableList.Builder<Module> overrideModules;
private Optional<Module> module;
private Optional<SmtpConfiguration> smtpConfiguration;
+ private Optional<MailetContainer> mailetConfiguration;
private Builder() {
overrideModules = ImmutableList.builder();
module = Optional.empty();
smtpConfiguration = Optional.empty();
+ mailetConfiguration = Optional.empty();
}
public Builder withBase(Module module) {
@@ -69,15 +83,25 @@ public class TemporaryJamesServer {
return this;
}
+ public Builder withMailetContainer(MailetContainer mailetConfiguration) {
+ this.mailetConfiguration = Optional.of(mailetConfiguration);
+ return this;
+ }
+
+
+ public Builder withMailetContainer(MailetContainer.Builder mailetConfiguration) {
+ return withMailetContainer(mailetConfiguration.build());
+ }
+
public Builder withOverrides(Module... modules) {
this.overrideModules.addAll(Arrays.asList(modules));
return this;
}
- public TemporaryJamesServer build(TemporaryFolder temporaryFolder, MailetContainer mailetContainer) throws Exception {
+ public TemporaryJamesServer build(TemporaryFolder temporaryFolder) throws Exception {
return new TemporaryJamesServer(
temporaryFolder,
- mailetContainer,
+ mailetConfiguration.orElse(DEFAUL_MAILET_CONTAINER_CONFIGURATION),
smtpConfiguration.orElse(SmtpConfiguration.DEFAULT),
module.orElse(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE),
overrideModules.build());
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 7ed510e..c2894bd 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
@@ -92,7 +92,8 @@ public class SMIMEDecryptIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 f9ef2dc..90d01a4 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
@@ -131,7 +131,8 @@ public class SMIMESignIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 800262c..bdd1405 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
@@ -141,7 +141,8 @@ public class SmtpAuthorizedAddressesTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withSmtpConfiguration(smtpConfiguration.build())
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 4db4a87..6ebe0a5 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
@@ -93,7 +93,8 @@ public class SmtpBracketEnforcementTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
.withSmtpConfiguration(smtpConfiguration.build())
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 c1890e9..6f3e8a5 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
@@ -91,7 +91,8 @@ public class SmtpIdentityVerificationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
.withSmtpConfiguration(smtpConfiguration.build())
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 295021b..20246bf 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
@@ -94,7 +94,8 @@ public class SmtpSizeLimitationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
.withSmtpConfiguration(smtpConfiguration.build())
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 538c037..a3a350f 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
@@ -116,7 +116,8 @@ public class AmqpForwardAttachmentTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with()
.pollInterval(slowPacedPollInterval)
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 f7ba334..380b64c 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
@@ -100,7 +100,8 @@ public class ContactExtractorTest {
.build();
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(folder, mailets);
+ .withMailetContainer(mailets)
+ .build(folder);
DataProbeImpl probe = jamesServer.getProbe(DataProbeImpl.class);
probe.addDomain(JAMES_ORG);
probe.addUser(SENDER, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 69362eb..8419cd3 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
@@ -152,7 +152,8 @@ public class GroupMappingTest {
jamesServer = TemporaryJamesServer.builder()
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 f6bd7ed..8be57ff 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
@@ -500,7 +500,8 @@ public class ICSAttachmentWorkflowTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
http://git-wip-us.apache.org/repos/asf/james-project/blob/91e88710/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 2419288..90621fa 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
@@ -97,7 +97,8 @@ public class StripAttachmentTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder, mailetContainer);
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[40/44] james-project git commit: JAMES-2267 Improve code quality of
MailetErrorsTest
Posted by bt...@apache.org.
JAMES-2267 Improve code quality of MailetErrorsTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4a34bf26
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4a34bf26
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4a34bf26
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 4a34bf26a2f67b5692645613ca5fa0bf82aacac1
Parents: 1c52910
Author: benwa <bt...@linagora.com>
Authored: Wed Jan 3 11:38:47 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:39 2018 +0700
----------------------------------------------------------------------
.../apache/james/mailets/MailetErrorsTest.java | 583 +++++++------------
.../impl/camel/CamelMailetProcessor.java | 7 +-
.../impl/camel/CamelProcessor.java | 4 +-
.../impl/camel/MatcherSplitter.java | 4 +-
4 files changed, 222 insertions(+), 376 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a34bf26/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
index 127a2ff..e912faa 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
@@ -21,63 +21,41 @@ package org.apache.james.mailets;
import static org.apache.james.MemoryJamesServerMain.SMTP_ONLY_MODULE;
import static org.apache.james.mailets.configuration.CommonProcessors.ERROR_REPOSITORY;
+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.LOCALHOST_IP;
+import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
+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.probe.DataProbe;
import org.apache.james.transport.mailets.ErrorMailet;
import org.apache.james.transport.mailets.ErrorMatcher;
import org.apache.james.transport.mailets.NoopMailet;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
+import org.apache.james.transport.mailets.Null;
import org.apache.james.transport.mailets.RuntimeErrorMailet;
import org.apache.james.transport.mailets.RuntimeErrorMatcher;
import org.apache.james.transport.mailets.ToRepository;
import org.apache.james.transport.matchers.All;
-import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.MailRepositoryProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
-import org.apache.mailet.Mail;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
-
public class MailetErrorsTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
- private static final String JAMES_ANOTHER_DOMAIN = "james.com";
-
- private static final String FROM = "from@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_ANOTHER_DOMAIN;
public static final String CUSTOM_PROCESSOR = "custom";
- public static final String CUSTOM_REPOSITORY = "file://var/mail/error/";
+ public static final String CUSTOM_REPOSITORY = "file://var/mail/custom/";
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public SMTPMessageSender smtpMessageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
- private DataProbe dataProbe;
-
- @Before
- public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
- }
@After
public void tearDown() {
@@ -90,454 +68,327 @@ public class MailetErrorsTest {
public void mailetProcessorsShouldHandleMessagingException() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ErrorMailet.class)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ErrorMailet.class))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
}
@Test
public void mailetProcessorsShouldHandleRuntimeException() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RuntimeErrorMailet.class)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(RuntimeErrorMailet.class))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
}
@Test
public void mailetProcessorsShouldHandleMessagingExceptionWhenSpecificErrorHandlingSpecified() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ErrorMailet.class)
- .addProperty("onMailetException", CUSTOM_PROCESSOR)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ErrorMailet.class)
+ .addProperty("onMailetException", CUSTOM_PROCESSOR))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
}
@Test
public void mailetProcessorsShouldHandleRuntimeExceptionWhenSpecificErrorHandlingSpecified() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RuntimeErrorMailet.class)
- .addProperty("onMailetException", CUSTOM_PROCESSOR)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(RuntimeErrorMailet.class)
+ .addProperty("onMailetException", CUSTOM_PROCESSOR))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
}
@Test
public void onExceptionIgnoreShouldContinueProcessingWhenRuntimeException() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RuntimeErrorMailet.class)
- .addProperty("onMailetException", "ignore")
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToRepository.class)
- .addProperty("repositoryPath", CUSTOM_REPOSITORY)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(RuntimeErrorMailet.class)
+ .addProperty("onMailetException", "ignore"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ToRepository.class)
+ .addProperty("repositoryPath", CUSTOM_REPOSITORY))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
-
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
}
@Test
public void onExceptionIgnoreShouldContinueProcessingWhenMessagingException() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ErrorMailet.class)
- .addProperty("onMailetException", "ignore")
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToRepository.class)
- .addProperty("repositoryPath", CUSTOM_REPOSITORY)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ErrorMailet.class)
+ .addProperty("onMailetException", "ignore"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ToRepository.class)
+ .addProperty("repositoryPath", CUSTOM_REPOSITORY))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
}
@Test
public void matcherProcessorsShouldHandleMessagingException() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(ErrorMatcher.class)
- .mailet(NoopMailet.class)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(ErrorMatcher.class)
+ .mailet(NoopMailet.class))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
}
@Test
public void matcherProcessorsShouldHandleRuntimeException() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(RuntimeErrorMatcher.class)
- .mailet(NoopMailet.class)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(RuntimeErrorMatcher.class)
+ .mailet(NoopMailet.class))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
-
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
}
@Test
public void matcherProcessorsShouldHandleMessagingExceptionWhenSpecificErrorHandlingSpecified() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(ErrorMatcher.class)
- .mailet(NoopMailet.class)
- .addProperty("onMailetException", CUSTOM_PROCESSOR)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(ErrorMatcher.class)
+ .mailet(NoopMailet.class)
+ .addProperty("onMatchException", CUSTOM_PROCESSOR))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
}
@Test
public void matcherProcessorsShouldHandleRuntimeExceptionWhenSpecificErrorHandlingSpecified() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(RuntimeErrorMatcher.class)
- .mailet(NoopMailet.class)
- .addProperty("onMailetException", CUSTOM_PROCESSOR)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(RuntimeErrorMatcher.class)
+ .mailet(NoopMailet.class)
+ .addProperty("onMatchException", CUSTOM_PROCESSOR))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
}
@Test
- public void onMatcherExceptionIgnoreShouldContinueProcessingWhenRuntimeException() throws Exception {
+ public void onMatcherExceptionIgnoreShouldNotMatchWhenRuntimeExceptionAndNoMatchConfigured() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(RuntimeErrorMatcher.class)
- .mailet(NoopMailet.class)
- .addProperty("onMailetException", "ignore")
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToRepository.class)
- .addProperty("repositoryPath", CUSTOM_REPOSITORY)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(RuntimeErrorMatcher.class)
+ .mailet(Null.class)
+ .addProperty("onMatchException", "nomatch"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ToRepository.class)
+ .addProperty("repositoryPath", CUSTOM_REPOSITORY))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
+ }
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
+ @Test
+ public void onMatcherExceptionIgnoreShouldNotMatchWhenMessagingExceptionAndNoMatchConfigured() throws Exception {
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(SMTP_ONLY_MODULE)
+ .withMailetContainer(MailetContainer.builder()
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
+ .addProcessor(errorProcessor())
+ .addProcessor(customProcessor())
+ .addProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(ErrorMatcher.class)
+ .mailet(Null.class)
+ .addProperty("onMatchException", "nomatch"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ToRepository.class)
+ .addProperty("repositoryPath", CUSTOM_REPOSITORY))))
+ .build(temporaryFolder);
+ MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
+
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
+
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
}
@Test
- public void onMatcherExceptionIgnoreShouldContinueProcessingWhenMessagingException() throws Exception {
+ public void onMatcherExceptionIgnoreShouldMatchWhenRuntimeExceptionAndAllMatchConfigured() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
- .build(temporaryFolder,
- MailetContainer.builder()
- .threads(2)
- .postmaster("postmaster@localhost")
- .addProcessor(emptyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.builder()
- .state(Mail.DEFAULT)
- .addMailet(MailetConfiguration.builder()
- .matcher(ErrorMatcher.class)
- .mailet(NoopMailet.class)
- .addProperty("onMailetException", "ignore")
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToRepository.class)
- .addProperty("repositoryPath", CUSTOM_REPOSITORY)
- .build())
- .build())
- .build());
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ .withMailetContainer(MailetContainer.builder()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(RuntimeErrorMatcher.class)
+ .mailet(ToRepository.class)
+ .addProperty("repositoryPath", CUSTOM_REPOSITORY)
+ .addProperty("onMatchException", "matchall"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(Null.class))))
+ .build(temporaryFolder);
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
- dataProbe.addUser(FROM, PASSWORD);
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
+ }
- calmlyAwait.atMost(Duration.TEN_SECONDS)
- .until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
- }
+ @Test
+ public void onMatcherExceptionIgnoreShouldMatchWhenMessagingExceptionAndAllMatchConfigured() throws Exception {
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(SMTP_ONLY_MODULE)
+ .withMailetContainer(MailetContainer.builder()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(ErrorMatcher.class)
+ .mailet(ToRepository.class)
+ .addProperty("repositoryPath", CUSTOM_REPOSITORY)
+ .addProperty("onMatchException", "matchall"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(Null.class))))
+ .build(temporaryFolder);
+ MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
+
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT).sendMessage(FROM, FROM);
+
+ awaitOneMinute.until(() -> probe.getRepositoryMailCount(CUSTOM_REPOSITORY) == 1);
}
- private ProcessorConfiguration errorProcessor() {
- return ProcessorConfiguration.builder()
- .state(Mail.ERROR)
- .enableJmx(true)
+ private ProcessorConfiguration.Builder errorProcessor() {
+ return ProcessorConfiguration.error()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", ERROR_REPOSITORY)
- .build())
- .build();
+ .addProperty("repositoryPath", ERROR_REPOSITORY));
}
- private ProcessorConfiguration customProcessor() {
+ private ProcessorConfiguration.Builder customProcessor() {
return ProcessorConfiguration.builder()
.state("custom")
- .enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", CUSTOM_REPOSITORY)
- .build())
- .build();
- }
-
- private ProcessorConfiguration emptyTransport() {
- return ProcessorConfiguration.builder()
- .state("transport")
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
- .build();
+ .addProperty("repositoryPath", CUSTOM_REPOSITORY));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a34bf26/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
index 0884ff2..42dbaed 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
@@ -33,7 +33,6 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
-import org.apache.james.mailetcontainer.impl.MailetConfigImpl;
import org.apache.james.mailetcontainer.impl.MatcherMailetPair;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor;
import org.apache.james.metrics.api.MetricFactory;
@@ -161,12 +160,8 @@ public class CamelMailetProcessor extends AbstractStateMailetProcessor implement
Matcher matcher = pair.getMatcher();
Mailet mailet = pair.getMailet();
- String onMatchException = null;
MailetConfig mailetConfig = mailet.getMailetConfig();
-
- if (mailetConfig instanceof MailetConfigImpl) {
- onMatchException = ((MailetConfigImpl) mailetConfig).getInitAttribute("onMatchException");
- }
+ String onMatchException = mailetConfig.getInitParameter("onMatchException");
CamelProcessor mailetProccessor = new CamelProcessor(metricFactory, mailet, CamelMailetProcessor.this);
// Store the matcher to use for splitter in properties
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a34bf26/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
index d82f127..e5da468 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
@@ -88,14 +88,14 @@ public class CamelProcessor implements Processor {
MailetConfig mailetConfig = mailet.getMailetConfig();
if (mailetConfig instanceof MailetConfigImpl) {
- onMailetException = ((MailetConfigImpl) mailetConfig).getInitAttribute("onMailetException");
+ onMailetException = mailetConfig.getInitParameter("onMailetException");
}
if (onMailetException == null) {
onMailetException = Mail.ERROR;
} else {
onMailetException = onMailetException.trim().toLowerCase(Locale.US);
}
- if (onMailetException.compareTo("ignore") == 0) {
+ if (onMailetException.equalsIgnoreCase("ignore")) {
// ignore the exception and continue
// this option should not be used if the mail object can be
// changed by the mailet
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a34bf26/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
index 64f00c1..876ce6a 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
@@ -127,12 +127,12 @@ public class MatcherSplitter {
} else {
onMatchException = onMatchException.trim().toLowerCase(Locale.US);
}
- if (onMatchException.compareTo("nomatch") == 0) {
+ if (onMatchException.equalsIgnoreCase("nomatch")) {
// In case the matcher returned null, create an empty
// Collection
LOGGER.warn("Encountered error while executing matcher {}. Matching none.", matcher, ex);
matchedRcpts = new ArrayList<>(0);
- } else if (onMatchException.compareTo("matchall") == 0) {
+ } else if (onMatchException.equalsIgnoreCase("matchall")) {
LOGGER.warn("Encountered error while executing matcher {}. matching all.", matcher, ex);
matchedRcpts = mail.getRecipients();
// no need to verify addresses
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[42/44] james-project git commit: JAMES-2262 Upgrade SpamAssassin
tests code quality
Posted by bt...@apache.org.
JAMES-2262 Upgrade SpamAssassin tests code quality
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1c529101
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1c529101
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1c529101
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 1c529101b6eb28166ccc89dbb562ab95e43c9824
Parents: 1d9f9df
Author: benwa <bt...@linagora.com>
Authored: Mon Dec 25 11:59:20 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:39 2018 +0700
----------------------------------------------------------------------
.../transport/mailets/SpamAssassinTest.java | 198 +++++++------------
1 file changed, 74 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1c529101/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 bf1541e..f20a7e2 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
@@ -19,18 +19,24 @@
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.SMTP_PORT;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
-import javax.mail.internet.MimeMessage;
+import javax.mail.MessagingException;
-import org.apache.james.core.MailAddress;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.util.scanner.SpamAssassinInvoker;
@@ -43,81 +49,52 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
-
public class SpamAssassinTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
-
- public static final String JAMES_ORG = "james.org";
- public static final String SENDER = "sender@" + JAMES_ORG;
- public static final String TO = "to@" + JAMES_ORG;
- public static final String PASSWORD = "secret";
+ private static final String SPAM_CONTENT = "XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X";
+ @Rule
public SwarmGenericContainer spamAssassinContainer = new SwarmGenericContainer(Images.SPAMASSASSIN)
.withExposedPorts(783)
.withAffinityToContainer()
.waitingFor(new HostPortWaitStrategy());
-
+ @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
@Rule
- public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(spamAssassinContainer);
+ public IMAPMessageReader messageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
- MailetContainer mailets = MailetContainer
- .builder()
- .threads(5)
- .postmaster(SENDER)
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
+ MailetContainer.Builder mailets = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(
- ProcessorConfiguration.builder()
- .state("transport")
+ ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(SpamAssassin.class)
- .addProperty(SpamAssassin.SPAMD_HOST, spamAssassinContainer.getContainerIp())
- .build())
+ .addProperty(SpamAssassin.SPAMD_HOST, spamAssassinContainer.getContainerIp()))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(MailAttributesToMimeHeaders.class)
.addProperty("simplemapping",
SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + ";" + SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + "," +
- SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME + ";" + SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME)
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
- .build();
+ SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME + ";" + SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME))
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport()));
+
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
- .build(temporaryFolder, mailets);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
+ .withMailetContainer(mailets)
+ .build(temporaryFolder);
DataProbeImpl probe = jamesServer.getProbe(DataProbeImpl.class);
- probe.addDomain(JAMES_ORG);
- probe.addUser(SENDER, PASSWORD);
- probe.addUser(TO, PASSWORD);
+ probe.addDomain(DEFAULT_DOMAIN);
+ probe.addUser(FROM, PASSWORD);
+ probe.addUser(RECIPIENT, PASSWORD);
}
@After
@@ -127,88 +104,61 @@ public class SpamAssassinTest {
@Test
public void spamAssassinShouldAppendNewHeaderOnMessage() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
- .setSender(SENDER)
- .addToRecipient(TO)
- .setSubject("This is the subject")
- .setText("This is -SPAM- my email")
- .build();
- FakeMail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipients(new MailAddress(TO))
- .build();
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
-
- messageSender.sendMessage(mail);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(TO, PASSWORD));
-
- String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(TO, PASSWORD);
-
- assertThat(receivedHeaders).contains(SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME, SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME);
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mailWithContent("This is the content"))
+ .awaitSent(awaitOneMinute);
+
+ messageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitOneMinute);
+
+ assertThat(messageReader.readFirstMessageHeaders())
+ .contains(
+ SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME,
+ SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME);
}
@Test
public void spamAssassinShouldAppendNewHeaderWhichDetectIsSpamWhenSpamMessage() throws Exception {
- String spamContent = "XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X";
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
- .setSender(SENDER)
- .addToRecipient(TO)
- .setSubject("This is the subject")
- .setText(spamContent)
- .build();
- FakeMail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipients(new MailAddress(TO))
- .build();
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
-
- messageSender.sendMessage(mail);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(TO, PASSWORD));
-
- String receivedHeaders = imapMessageReader.readFirstMessageInInbox(TO, PASSWORD);
-
- assertThat(receivedHeaders).contains(SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + ": YES");
- assertThat(receivedHeaders).contains(SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME + ": Yes");
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mailWithContent(SPAM_CONTENT))
+ .awaitSent(awaitOneMinute);
+
+ messageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitOneMinute);
+
+ String receivedHeaders = messageReader.readFirstMessageHeaders();
+ assertThat(receivedHeaders).contains(SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + ": YES");
+ assertThat(receivedHeaders).contains(SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME + ": Yes");
}
@Test
public void spamAssassinShouldAppendNewHeaderWhichNoWhenNonSpamMessage() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
- .setSender(SENDER)
- .addToRecipient(TO)
- .setSubject("This is the subject")
- .setText("This is the content")
- .build();
- FakeMail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipients(new MailAddress(TO))
- .build();
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
-
- messageSender.sendMessage(mail);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(TO, PASSWORD));
-
- String receivedHeaders = imapMessageReader.readFirstMessageInInbox(TO, PASSWORD);
-
- assertThat(receivedHeaders).contains(SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + ": NO");
- assertThat(receivedHeaders).contains(SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME + ": No");
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mailWithContent("This is the content"))
+ .awaitSent(awaitOneMinute);
+
+ messageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitOneMinute);
+
+ String receivedHeaders = messageReader.readFirstMessageHeaders();
+ assertThat(receivedHeaders).contains(SpamAssassinInvoker.FLAG_MAIL_ATTRIBUTE_NAME + ": NO");
+ assertThat(receivedHeaders).contains(SpamAssassinInvoker.STATUS_MAIL_ATTRIBUTE_NAME + ": No");
+ }
+
+ private FakeMail.Builder mailWithContent(String textContent) throws MessagingException {
+ return FakeMail.builder()
+ .mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
+ .setSender(FROM)
+ .addToRecipient(RECIPIENT)
+ .setSubject("This is the subject")
+ .setText(textContent))
+ .sender(FROM)
+ .recipient(RECIPIENT);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[29/44] james-project git commit: JAMES-2267 Factorize FakeSmtp
concerns
Posted by bt...@apache.org.
JAMES-2267 Factorize FakeSmtp concerns
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/95a3266c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/95a3266c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/95a3266c
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 95a3266c77828b1ce7fa947c29efa35e156aaacf
Parents: d6fade9
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 10:33:46 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
mpt/impl/smtp/core/pom.xml | 4 ++
.../apache/james/mpt/smtp/ForwardSmtpTest.java | 36 +++++--------
.../GatewayRemoteDeliveryIntegrationTest.java | 30 +++--------
.../james/smtp/SmtpAuthorizedAddressesTest.java | 44 +++++----------
.../jmap/VacationRelayIntegrationTest.java | 35 +++---------
server/testing/pom.xml | 4 ++
.../org/apache/james/utils/FakeSmtpHelper.java | 56 ++++++++++++++++++++
7 files changed, 102 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/95a3266c/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index d88ca7e..9db5462 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -50,6 +50,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-testing</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/95a3266c/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index d3ce040..12e41fb 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -18,18 +18,17 @@
****************************************************************/
package org.apache.james.mpt.smtp;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static com.jayway.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.hamcrest.Matchers.equalTo;
import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
import java.util.Locale;
import org.apache.james.mpt.script.SimpleScriptedTestProtocol;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
+import org.apache.james.utils.FakeSmtpHelper;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -41,8 +40,6 @@ import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public abstract class ForwardSmtpTest {
@@ -59,6 +56,7 @@ public abstract class ForwardSmtpTest {
@Rule
public final RuleChain chain = RuleChain.outerRule(folder).around(fakeSmtp);
+ private ConditionFactory calmlyAwait;
protected abstract SmtpHostSystem createSmtpHostSystem();
@@ -79,35 +77,27 @@ public abstract class ForwardSmtpTest {
.registerRecord("yopmail.com", containerIp, "yopmail.com");
hostSystem.addAddressMapping(USER, DOMAIN, "ray@yopmail.com");
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(80)
- .setBaseUri("http://" + containerIp.getHostAddress())
- .build();
+ RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- ConditionFactory calmlyAwait = Awaitility.with()
+ Duration slowPacedPollInterval = FIVE_HUNDRED_MILLISECONDS;
+ calmlyAwait = Awaitility.with()
.pollInterval(slowPacedPollInterval)
.and()
.with()
.pollDelay(slowPacedPollInterval)
.await();
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
}
@Test
public void forwardingAnEmailShouldWork() throws Exception {
scriptedTest.run("helo");
- when()
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("[0].from", equalTo("matthieu@yopmail.com"))
- .body("[0].subject", equalTo("test"))
- .body("[0].text", equalTo("content"));
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
+ FakeSmtpHelper.isReceived(response -> response
+ .body("[0].from", equalTo("matthieu@yopmail.com"))
+ .body("[0].subject", equalTo("test"))
+ .body("[0].text", equalTo("content"))));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/95a3266c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 714264b..bb95936 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -20,8 +20,6 @@
package org.apache.james.mailets;
import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.MemoryJamesServerMain.SMTP_AND_IMAP_MODULE;
import static org.apache.james.MemoryJamesServerMain.SMTP_ONLY_MODULE;
import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
@@ -34,7 +32,6 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import org.apache.james.dnsservice.api.DNSService;
@@ -52,6 +49,7 @@ import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
+import org.apache.james.utils.FakeSmtpHelper;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -63,8 +61,6 @@ import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public class GatewayRemoteDeliveryIntegrationTest {
private static final String JAMES_ANOTHER_DOMAIN = "james.com";
@@ -95,13 +91,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
public void setup() throws Exception {
awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(80)
- .setBaseUri("http://" + fakeSmtp.getContainerIp())
- .build();
+ RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
}
@After
@@ -318,18 +308,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
}
private boolean messageIsReceivedByTheSmtpServer() {
- try {
- when()
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("", hasSize(1))
- .body("[0].from", equalTo(FROM))
- .body("[0].subject", equalTo("test"));
- return true;
- } catch (Exception e) {
- return false;
- }
+ return FakeSmtpHelper.isReceived(response -> response
+ .body("", hasSize(1))
+ .body("[0].from", equalTo(FROM))
+ .body("[0].subject", equalTo("test")));
}
private MailetContainer generateMailetContainerConfiguration(String gatewayProperty) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/95a3266c/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 1e8ba38..571e3c3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -19,9 +19,6 @@
package org.apache.james.smtp;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
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;
@@ -31,8 +28,6 @@ import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
-import java.nio.charset.StandardCharsets;
-
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -47,8 +42,10 @@ import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.SMTPIsAuthNetwork;
+import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
+import org.apache.james.utils.FakeSmtpHelper;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -60,15 +57,13 @@ import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public class SmtpAuthorizedAddressesTest {
private static final String FROM = "fromuser@" + DEFAULT_DOMAIN;
private static final String TO = "to@any.com";
private final TemporaryFolder smtpFolder = new TemporaryFolder();
- private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
+ private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
.withExposedPorts(25)
.withAffinityToContainer()
.waitingFor(new HostPortWaitStrategy());
@@ -89,13 +84,7 @@ public class SmtpAuthorizedAddressesTest {
public void setup() throws Exception {
awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(80)
- .setBaseUri("http://" + fakeSmtp.getContainerIp())
- .build();
+ RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
}
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
@@ -158,7 +147,10 @@ public class SmtpAuthorizedAddressesTest {
.sendMessage(FROM, TO)
.awaitSent(awaitOneMinute);
- awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(() -> FakeSmtpHelper.isReceived(response -> response
+ .body("", hasSize(1))
+ .body("[0].from", equalTo(FROM))
+ .body("[0].subject", equalTo("test"))));
}
@Test
@@ -184,7 +176,10 @@ public class SmtpAuthorizedAddressesTest {
.sendMessage(FROM, TO)
.awaitSent(awaitOneMinute);
- awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(() -> FakeSmtpHelper.isReceived(response -> response
+ .body("", hasSize(1))
+ .body("[0].from", equalTo(FROM))
+ .body("[0].subject", equalTo("test"))));
}
@Test
@@ -203,19 +198,4 @@ public class SmtpAuthorizedAddressesTest {
.awaitMessage(awaitOneMinute);
}
- private boolean messageIsReceivedByTheSmtpServer() {
- try {
- when()
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("", hasSize(1))
- .body("[0].from", equalTo(FROM))
- .body("[0].subject", equalTo("test"));
- return true;
- } catch (Exception e) {
- return false;
- }
- }
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/95a3266c/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
index da9baa9..3ef66d6 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
@@ -19,13 +19,9 @@
package org.apache.james.jmap;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.hamcrest.Matchers.equalTo;
import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import org.apache.commons.net.smtp.SMTPClient;
@@ -40,6 +36,7 @@ import org.apache.james.probe.DataProbe;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
+import org.apache.james.utils.FakeSmtpHelper;
import org.apache.james.utils.JmapGuiceProbe;
import org.junit.After;
import org.junit.Before;
@@ -51,8 +48,6 @@ import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public abstract class VacationRelayIntegrationTest {
@@ -102,13 +97,7 @@ public abstract class VacationRelayIntegrationTest {
jmapGuiceProbe = guiceJamesServer.getProbe(JmapGuiceProbe.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(80)
- .setBaseUri("http://" + containerIp.getHostAddress())
- .build();
+ RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility
@@ -143,20 +132,10 @@ public abstract class VacationRelayIntegrationTest {
smtpClient.sendShortMessageData("content");
calmlyAwait.atMost(1, TimeUnit.MINUTES)
- .until(() -> {
- try {
- when()
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("[0].from", equalTo(USER_WITH_DOMAIN))
- .body("[0].to[0]", equalTo(externalMail))
- .body("[0].text", equalTo(REASON));
-
- return true;
- } catch(AssertionError e) {
- return false;
- }
- });
+ .until(() ->
+ FakeSmtpHelper.isReceived(response -> response
+ .body("[0].from", equalTo(USER_WITH_DOMAIN))
+ .body("[0].to[0]", equalTo(externalMail))
+ .body("[0].text", equalTo(REASON))));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/95a3266c/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index 1a1b9fc..f989249 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -45,6 +45,10 @@
<artifactId>awaitility</artifactId>
</dependency>
<dependency>
+ <groupId>com.jayway.restassured</groupId>
+ <artifactId>rest-assured</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/95a3266c/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java
new file mode 100644
index 0000000..7129f60
--- /dev/null
+++ b/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java
@@ -0,0 +1,56 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.utils;
+
+import static com.jayway.restassured.RestAssured.when;
+import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
+import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+
+import java.util.function.Function;
+
+import com.google.common.base.Charsets;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.response.ValidatableResponse;
+import com.jayway.restassured.specification.RequestSpecification;
+
+public class FakeSmtpHelper {
+ public static RequestSpecification requestSpecification(String ip) {
+ return new RequestSpecBuilder()
+ .setContentType(ContentType.JSON)
+ .setAccept(ContentType.JSON)
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)))
+ .setPort(80)
+ .setBaseUri("http://" + ip)
+ .build();
+ }
+
+ public static boolean isReceived(Function<ValidatableResponse, ValidatableResponse> expectations) {
+ try {
+ expectations.apply(when()
+ .get("/api/email")
+ .then()
+ .statusCode(200));
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[16/44] james-project git commit: JAMES-2267 Remove enableJmx where
not needed
Posted by bt...@apache.org.
JAMES-2267 Remove enableJmx where not needed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bb56d231
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bb56d231
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bb56d231
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: bb56d231fdf236d7d27910a5c0c3c70fda1d20ba
Parents: e0251a0
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 14:04:33 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/GatewayRemoteDeliveryIntegrationTest.java | 5 -----
.../java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 1 -
.../java/org/apache/james/smtp/SmtpBracketEnforcementTest.java | 1 -
.../org/apache/james/smtp/SmtpIdentityVerificationTest.java | 1 -
.../test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java | 1 -
.../james/transport/mailets/AmqpForwardAttachmentTest.java | 1 -
.../org/apache/james/transport/mailets/GroupMappingTest.java | 2 --
.../james/transport/mailets/ICSAttachmentWorkflowTest.java | 1 -
.../org/apache/james/transport/mailets/StripAttachmentTest.java | 1 -
9 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 9c396d9..e4fa011 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -275,7 +275,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
@@ -365,7 +364,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
public ProcessorConfiguration root() {
// Custom in memory DNS resolution is not possible combined with InSpamerBackList
return ProcessorConfiguration.root()
- .enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
@@ -375,7 +373,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
private ProcessorConfiguration relayOnlyTransport(String gatewayProperty) {
return ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
@@ -396,7 +393,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
private ProcessorConfiguration relayAndLocalDeliveryTransport(String gatewayProperty) {
return ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
@@ -417,7 +413,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
private ProcessorConfiguration directResolutionTransport() {
return ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 bdd1405..716df0f 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
@@ -114,7 +114,6 @@ public class SmtpAuthorizedAddressesTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 6ebe0a5..5f525ad 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
@@ -77,7 +77,6 @@ public class SmtpBracketEnforcementTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 6f3e8a5..ec42324 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
@@ -79,7 +79,6 @@ public class SmtpIdentityVerificationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 20246bf..cfc5aa8 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
@@ -78,7 +78,6 @@ public class SmtpSizeLimitationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 a3a350f..8b32a50 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
@@ -91,7 +91,6 @@ public class AmqpForwardAttachmentTest {
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 a2be7f2..54bf94f 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
@@ -108,7 +108,6 @@ public class GroupMappingTest {
MailetContainer mailetContainer = MailetContainer.builder()
.addProcessor(ProcessorConfiguration.root()
- .enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(RelayLimit.class)
.matcherCondition("30")
@@ -119,7 +118,6 @@ public class GroupMappingTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 8be57ff..cdce474 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
@@ -457,7 +457,6 @@ public class ICSAttachmentWorkflowTest {
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/bb56d231/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 90621fa..a26aa5a 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
@@ -75,7 +75,6 @@ public class StripAttachmentTest {
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[30/44] james-project git commit: JAMES-2267 Some SMTP related tests
don't need MailetContainer customization
Posted by bt...@apache.org.
JAMES-2267 Some SMTP related tests don't need MailetContainer customization
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ea8b4de9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ea8b4de9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ea8b4de9
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: ea8b4de99eff3240dcd77e4f02d0f440d4d08813
Parents: 0b7685a
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 10:54:32 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
.../james/smtp/SmtpBracketEnforcementTest.java | 27 --------------------
.../smtp/SmtpIdentityVerificationTest.java | 23 -----------------
.../james/smtp/SmtpSizeLimitationTest.java | 27 --------------------
3 files changed, 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea8b4de9/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 30d2783..ca52508 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
@@ -25,16 +25,9 @@ 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.awaitOneMinute;
-import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
-import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
-import org.apache.james.transport.mailets.ToProcessor;
-import org.apache.james.transport.matchers.All;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -53,28 +46,8 @@ public class SmtpBracketEnforcementTest {
private TemporaryJamesServer jamesServer;
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(ProcessorConfiguration.root()
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
- .addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)))
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .build();
jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
.withSmtpConfiguration(smtpConfiguration)
- .withMailetContainer(mailetContainer)
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea8b4de9/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 677d827..fdf7f7c 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
@@ -25,16 +25,9 @@ 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.awaitOneMinute;
-import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
-import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
-import org.apache.james.transport.mailets.ToProcessor;
-import org.apache.james.transport.matchers.All;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -56,24 +49,8 @@ public class SmtpIdentityVerificationTest {
private TemporaryJamesServer jamesServer;
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(ProcessorConfiguration.root()
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
- .addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY))
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .build();
jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
.withSmtpConfiguration(smtpConfiguration)
- .withMailetContainer(mailetContainer)
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea8b4de9/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 657cdc3..1509c26 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
@@ -25,16 +25,9 @@ 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.awaitOneMinute;
-import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
-import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
-import org.apache.james.transport.mailets.ToProcessor;
-import org.apache.james.transport.matchers.All;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -55,28 +48,8 @@ public class SmtpSizeLimitationTest {
private TemporaryJamesServer jamesServer;
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(ProcessorConfiguration.root()
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
- .addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)))
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .build();
jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
.withSmtpConfiguration(smtpConfiguration)
- .withMailetContainer(mailetContainer)
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[26/44] james-project git commit: JAMES-2267 Sieve integration test
target mailbox should be a constant
Posted by bt...@apache.org.
JAMES-2267 Sieve integration test target mailbox should be a constant
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/578b5f12
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/578b5f12
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/578b5f12
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 578b5f126a4297cc76aaf06cc59f9f90443395b3
Parents: ca7051a
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 17:47:24 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/mailet/base/test/FakeMail.java | 4 ++++
.../org/apache/james/mailets/SieveDelivery.java | 17 ++++++++---------
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/578b5f12/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index 90acb0d..bcb59f9 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -141,6 +141,10 @@ public class FakeMail implements Mail {
return this;
}
+ public Builder recipients() {
+ return this;
+ }
+
public Builder recipients(List<MailAddress> recipients) {
this.recipients.addAll(recipients);
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/578b5f12/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 7a2d064..3364b33 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
@@ -30,7 +30,6 @@ import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.store.probe.MailboxProbe;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.modules.protocols.SieveProbeImpl;
import org.apache.james.probe.DataProbe;
@@ -44,6 +43,8 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class SieveDelivery {
+ private static final String TARGETED_MAILBOX = "INBOX.any";
+
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
@@ -52,21 +53,18 @@ public class SieveDelivery {
public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
- private String targetedMailbox;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
- targetedMailbox = "INBOX.any";
-
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
- MailboxProbe mailboxProbe = jamesServer.getProbe(MailboxProbeImpl.class);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, targetedMailbox);
+ jamesServer.getProbe(MailboxProbeImpl.class)
+ .createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, TARGETED_MAILBOX);
}
@After
@@ -76,9 +74,10 @@ public class SieveDelivery {
@Test
public void simpleMailShouldBeSent() throws Exception {
- jamesServer.getProbe(SieveProbeImpl.class).addActiveSieveScript(RECIPIENT, "myscript.sieve", "require \"fileinto\";\n" +
+ jamesServer.getProbe(SieveProbeImpl.class).addActiveSieveScript(RECIPIENT, "myscript.sieve",
+ "require \"fileinto\";\n" +
"\n" +
- "fileinto \"" + targetedMailbox + "\";");
+ "fileinto \"" + TARGETED_MAILBOX + "\";");
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
@@ -86,7 +85,7 @@ public class SieveDelivery {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
- .select(targetedMailbox)
+ .select(TARGETED_MAILBOX)
.awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[21/44] james-project git commit: JAMES-2267 Factorize
ConditionFactory (awaitability) for mailet integration tests
Posted by bt...@apache.org.
JAMES-2267 Factorize ConditionFactory (awaitability) for mailet integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fb6e2f0c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fb6e2f0c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fb6e2f0c
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: fb6e2f0cc7084571127b543750809fe562425e05
Parents: bb56d23
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 14:14:10 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 12 ++-----
.../james/mailets/BounceIntegrationTest.java | 18 ++---------
.../mailets/CommonMailetConfigurationTest.java | 7 ++--
.../GatewayRemoteDeliveryIntegrationTest.java | 12 +------
.../mailets/NetworkMatcherIntegrationTest.java | 16 +--------
.../RecipientRewriteTableIntegrationTest.java | 7 ++--
.../org/apache/james/mailets/SieveDelivery.java | 7 ++--
.../james/mailets/SmtpAuthIntegrationTest.java | 12 +------
.../james/mailets/configuration/AwaitUtils.java | 34 ++++++++++++++++++++
.../crypto/SMIMEDecryptIntegrationTest.java | 6 +---
.../crypto/SMIMESignIntegrationTest.java | 6 +---
.../james/smtp/SmtpAuthorizedAddressesTest.java | 11 +------
.../james/smtp/SmtpBracketEnforcementTest.java | 17 ++--------
.../smtp/SmtpIdentityVerificationTest.java | 17 ++--------
.../james/smtp/SmtpSizeLimitationTest.java | 17 ++--------
.../mailets/AmqpForwardAttachmentTest.java | 11 +------
.../transport/mailets/ContactExtractorTest.java | 5 ++-
.../transport/mailets/GroupMappingTest.java | 7 +---
.../mailets/ICSAttachmentWorkflowTest.java | 6 +---
.../transport/mailets/StripAttachmentTest.java | 6 +---
20 files changed, 62 insertions(+), 172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index e281064..0de42e5 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -19,6 +19,8 @@
package org.apache.james.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
@@ -32,9 +34,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class AddDeliveredToHeaderTest {
@@ -48,18 +48,10 @@ public class AddDeliveredToHeaderTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 41c642a..862f51c 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
@@ -19,6 +19,8 @@
package org.apache.james.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -41,14 +43,11 @@ import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class BounceIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -65,21 +64,8 @@ public class BounceIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
private DataProbe dataProbe;
-
- @Before
- public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
- }
-
@After
public void tearDown() {
jamesServer.shutdown();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 89409a2..5e121f2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -19,6 +19,8 @@
package org.apache.james.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
@@ -31,9 +33,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class CommonMailetConfigurationTest {
@@ -47,13 +47,10 @@ public class CommonMailetConfigurationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index e4fa011..9756adc 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -24,6 +24,7 @@ import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.MemoryJamesServerMain.SMTP_AND_IMAP_MODULE;
import static org.apache.james.MemoryJamesServerMain.SMTP_ONLY_MODULE;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -58,9 +59,7 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -90,19 +89,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
public final RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp);
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
private DataProbe dataProbe;
@Before
public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
-
calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
RestAssured.requestSpecification = new RequestSpecBuilder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 9d9b0ce..311da8e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.MemoryJamesServerMain;
@@ -38,14 +39,11 @@ import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.MailRepositoryProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class NetworkMatcherIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -61,18 +59,6 @@ public class NetworkMatcherIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
-
- @Before
- public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
- }
private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
TemporaryJamesServer temporaryJamesServer = TemporaryJamesServer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index d5eef85..ca90233 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -19,6 +19,8 @@
package org.apache.james.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
@@ -31,9 +33,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class RecipientRewriteTableIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -56,15 +56,12 @@ public class RecipientRewriteTableIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
private DataProbe dataProbe;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 07dbae4..c67bb9b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
@@ -19,6 +19,8 @@
package org.apache.james.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.store.probe.MailboxProbe;
import org.apache.james.modules.MailboxProbeImpl;
@@ -33,9 +35,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class SieveDelivery {
@@ -49,13 +49,10 @@ public class SieveDelivery {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 5b9b612..8b5ecac 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.MemoryJamesServerMain;
@@ -42,9 +43,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class SmtpAuthIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -61,7 +60,6 @@ public class SmtpAuthIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
@@ -91,14 +89,6 @@ public class SmtpAuthIntegrationTest {
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
dataProbe.addUser(FROM, PASSWORD);
-
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
}
private ProcessorConfiguration deliverOnlyTransport() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java
new file mode 100644
index 0000000..6ecbaa8
--- /dev/null
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java
@@ -0,0 +1,34 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.mailets.configuration;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.Duration;
+import com.jayway.awaitility.core.ConditionFactory;
+
+public class AwaitUtils {
+ public static Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
+ public static ConditionFactory calmlyAwait = Awaitility.with()
+ .pollInterval(slowPacedPollInterval)
+ .and()
+ .with()
+ .pollDelay(slowPacedPollInterval)
+ .await();
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 ef7cd83..a7f42c3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets.crypto;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -47,9 +48,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class SMIMEDecryptIntegrationTest {
private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
@@ -65,7 +64,6 @@ public class SMIMEDecryptIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
@@ -92,8 +90,6 @@ public class SMIMEDecryptIntegrationTest {
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
DataProbeImpl serverProbe = jamesServer.getProbe(DataProbeImpl.class);
serverProbe.addDomain(DEFAULT_DOMAIN);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 391dfe0..4c8dc82 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets.crypto;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.time.ZonedDateTime;
@@ -48,9 +49,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class SMIMESignIntegrationTest {
@@ -66,7 +65,6 @@ public class SMIMESignIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
public static final String FROM = "user@" + DEFAULT_DOMAIN;
public static final String RECIPIENT = "user2@" + DEFAULT_DOMAIN;
@@ -106,8 +104,6 @@ public class SMIMESignIntegrationTest {
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 716df0f..3f95345 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
@@ -22,6 +22,7 @@ package org.apache.james.smtp;
import static com.jayway.restassured.RestAssured.when;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -53,9 +54,7 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -83,17 +82,9 @@ public class SmtpAuthorizedAddressesTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
RestAssured.requestSpecification = new RequestSpecBuilder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 5f525ad..70364d9 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
@@ -19,6 +19,8 @@
package org.apache.james.smtp;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -34,14 +36,11 @@ import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class SmtpBracketEnforcementTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -55,18 +54,6 @@ public class SmtpBracketEnforcementTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
-
- @Before
- public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
- }
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 ec42324..a360625 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
@@ -19,6 +19,8 @@
package org.apache.james.smtp;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -34,14 +36,11 @@ import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class SmtpIdentityVerificationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -57,18 +56,6 @@ public class SmtpIdentityVerificationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
-
- @Before
- public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
- }
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 cfc5aa8..40e5873 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
@@ -19,6 +19,8 @@
package org.apache.james.smtp;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -34,15 +36,12 @@ import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import com.google.common.base.Strings;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class SmtpSizeLimitationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -56,18 +55,6 @@ public class SmtpSizeLimitationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
-
- @Before
- public void setup() throws Exception {
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
- }
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 8b32a50..5b4f451 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -51,9 +52,7 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class AmqpForwardAttachmentTest {
@@ -83,7 +82,6 @@ public class AmqpForwardAttachmentTest {
public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
@@ -117,13 +115,6 @@ public class AmqpForwardAttachmentTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
DataProbe dataprobe = jamesServer.getProbe(DataProbeImpl.class);
dataprobe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 380b64c..94652f1 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
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
@@ -48,7 +49,6 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
public class ContactExtractorTest {
@@ -136,8 +136,7 @@ public class ContactExtractorTest {
IMAPMessageReader imap = new IMAPMessageReader("localhost", 1143)) {
messageSender.sendMessage(mail);
- Awaitility.await().pollDelay(Duration.FIVE_HUNDRED_MILLISECONDS)
- .atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(Duration.ONE_MINUTE)
.until(() -> imap.userReceivedMessage(TO, PASSWORD));
Optional<String> actual = amqpRule.readContent();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 54bf94f..ca7d04a 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
@@ -20,6 +20,7 @@
package org.apache.james.transport.mailets;
import static com.jayway.restassured.RestAssured.with;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -60,9 +61,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.specification.RequestSpecification;
@@ -84,7 +83,6 @@ public class GroupMappingTest {
private static final String MESSAGE_CONTENT = "any text";
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
private MimeMessage message;
private DataProbe dataProbe;
private RequestSpecification restApiRequest;
@@ -145,9 +143,6 @@ public class GroupMappingTest {
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
-
calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 cdce474..bdc0897 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -56,9 +57,7 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import com.google.common.collect.ImmutableList;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
@@ -443,7 +442,6 @@ public class ICSAttachmentWorkflowTest {
@Rule
public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
- private ConditionFactory calmlyAwait;
private TemporaryJamesServer jamesServer;
private MimeMessage messageWithoutICSAttached;
private MimeMessage messageWithICSAttached;
@@ -501,8 +499,6 @@ public class ICSAttachmentWorkflowTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb6e2f0c/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 a26aa5a..b741b1f 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
+import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
@@ -47,9 +48,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
public class StripAttachmentTest {
@@ -67,7 +66,6 @@ public class StripAttachmentTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
@@ -98,8 +96,6 @@ public class StripAttachmentTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(JAMES_APACHE_ORG);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[20/44] james-project git commit: JAMES-2267 Easy awaitSent for Smtp
client
Posted by bt...@apache.org.
JAMES-2267 Easy awaitSent for Smtp client
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fe92484c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fe92484c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fe92484c
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: fe92484c66c381eab7aecfda60d301a9f1d78bd2
Parents: fb6e2f0
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 14:43:41 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 9 +-
.../james/mailets/BounceIntegrationTest.java | 17 ++--
.../mailets/CommonMailetConfigurationTest.java | 9 +-
.../GatewayRemoteDeliveryIntegrationTest.java | 18 ++--
.../mailets/NetworkMatcherIntegrationTest.java | 53 ++++++-----
.../RecipientRewriteTableIntegrationTest.java | 37 ++++----
.../org/apache/james/mailets/SieveDelivery.java | 9 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 16 ++--
.../crypto/SMIMEDecryptIntegrationTest.java | 24 ++---
.../crypto/SMIMESignIntegrationTest.java | 15 ++--
.../james/smtp/SmtpAuthorizedAddressesTest.java | 26 +++---
.../james/smtp/SmtpBracketEnforcementTest.java | 17 ++--
.../smtp/SmtpIdentityVerificationTest.java | 13 ++-
.../james/smtp/SmtpSizeLimitationTest.java | 8 +-
.../mailets/AmqpForwardAttachmentTest.java | 7 +-
.../transport/mailets/ContactExtractorTest.java | 5 +-
.../transport/mailets/GroupMappingTest.java | 94 ++++++++++----------
.../mailets/ICSAttachmentWorkflowTest.java | 58 ++++++------
.../transport/mailets/StripAttachmentTest.java | 9 +-
server/testing/pom.xml | 4 +
.../apache/james/utils/SMTPMessageSender.java | 17 +++-
21 files changed, 231 insertions(+), 234 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index 0de42e5..c0d4aae 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -34,8 +35,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class AddDeliveredToHeaderTest {
private static final String DEFAULT_DOMAIN = "james.org";
@@ -74,9 +73,9 @@ public class AddDeliveredToHeaderTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(from, recipient);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.readFirstMessageHeadersInInbox(recipient, PASSWORD)
+ messageSender.sendMessage(from, recipient)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.readFirstMessageHeadersInInbox(recipient, PASSWORD)
.contains(AddDeliveredToHeader.DELIVERED_TO + ": " + recipient));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 862f51c..ee269fb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
@@ -47,8 +48,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class BounceIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
@@ -91,7 +90,7 @@ public class BounceIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -116,7 +115,7 @@ public class BounceIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -141,7 +140,7 @@ public class BounceIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -167,7 +166,7 @@ public class BounceIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -193,7 +192,7 @@ public class BounceIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -218,7 +217,7 @@ public class BounceIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -243,7 +242,7 @@ public class BounceIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(POSTMASTER, PASSWORD, MailboxConstants.INBOX));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 5e121f2..285de39 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -33,8 +34,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class CommonMailetConfigurationTest {
private static final String DEFAULT_DOMAIN = "james.org";
@@ -74,9 +73,9 @@ public class CommonMailetConfigurationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(from, recipient);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(recipient, PASSWORD));
+ messageSender.sendMessage(from, recipient)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(recipient, PASSWORD));
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 9756adc..5c2c3e7 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.when;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
@@ -59,7 +60,6 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.jayway.awaitility.Duration;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -93,7 +93,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Before
public void setup() throws Exception {
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
RestAssured.requestSpecification = new RequestSpecBuilder()
.setContentType(ContentType.JSON)
@@ -127,7 +127,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
}
@@ -147,7 +147,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
}
@@ -167,7 +167,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
}
@@ -187,7 +187,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
}
@@ -245,7 +245,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -293,7 +293,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() ->
+ calmlyAwait.atMost(ONE_MINUTE).until(() ->
imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX));
}
}
@@ -322,7 +322,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 311da8e..709b3fe 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -43,8 +44,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class NetworkMatcherIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
@@ -110,10 +109,10 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
@@ -132,10 +131,10 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
@@ -154,10 +153,10 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
@@ -176,10 +175,10 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
@@ -198,10 +197,10 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
@@ -220,10 +219,10 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
@@ -242,12 +241,11 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse();
}
}
@@ -266,12 +264,11 @@ public class NetworkMatcherIntegrationTest {
SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index ca90233..007a064 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -33,8 +34,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class RecipientRewriteTableIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int IMAP_PORT = 1143;
@@ -85,10 +84,10 @@ public class RecipientRewriteTableIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_JAMES, PASSWORD));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD));
+ messageSender.sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_JAMES, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD));
}
}
@@ -105,10 +104,10 @@ public class RecipientRewriteTableIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(RECIPIENT, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(RECIPIENT, PASSWORD));
}
}
@@ -127,11 +126,11 @@ public class RecipientRewriteTableIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(localUser, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(localUser, PASSWORD));
}
}
@@ -144,9 +143,9 @@ public class RecipientRewriteTableIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, ANY_AT_JAMES);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_ANOTHER_DOMAIN, PASSWORD));
+ messageSender.sendMessage(FROM, ANY_AT_JAMES)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_ANOTHER_DOMAIN, PASSWORD));
}
}
@@ -159,9 +158,9 @@ public class RecipientRewriteTableIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, ANY_AT_JAMES);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(ANY_AT_JAMES, PASSWORD));
+ messageSender.sendMessage(FROM, ANY_AT_JAMES)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(ANY_AT_JAMES, PASSWORD));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
index c67bb9b..b5edede 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -35,8 +36,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class SieveDelivery {
private static final String DEFAULT_DOMAIN = "james.org";
@@ -79,9 +78,9 @@ public class SieveDelivery {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(from, recipient);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(recipient, PASSWORD, targetedMailbox));
+ messageSender.sendMessage(from, recipient)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(recipient, PASSWORD, targetedMailbox));
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
index 8b5ecac..dd3f113 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -43,8 +44,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class SmtpAuthIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
@@ -122,10 +121,10 @@ public class SmtpAuthIntegrationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
@@ -136,12 +135,11 @@ public class SmtpAuthIntegrationTest {
SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, FROM);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
index a7f42c3..e5f5f44 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets.crypto;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -48,8 +49,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class SMIMEDecryptIntegrationTest {
private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -108,9 +107,10 @@ public class SMIMEDecryptIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ messageSender.sendMessageWithHeaders(FROM, FROM,
+ IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII))
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD))
.containsSequence("Crypted content");
@@ -122,9 +122,10 @@ public class SMIMEDecryptIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ messageSender.sendMessageWithHeaders(FROM, FROM,
+ IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII))
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD))
.containsSequence("Crypted Content with attachment");
@@ -136,9 +137,10 @@ public class SMIMEDecryptIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessageWithHeaders(FROM, FROM, IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ messageSender.sendMessageWithHeaders(FROM, FROM,
+ IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII))
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD))
.containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE");
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
index 4c8dc82..531d96c 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.mailets.crypto;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -49,8 +50,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class SMIMESignIntegrationTest {
private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
@@ -122,9 +121,9 @@ public class SMIMESignIntegrationTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD))
.containsSequence("Content-Description: S/MIME Cryptographic Signature");
@@ -135,9 +134,9 @@ public class SMIMESignIntegrationTest {
public void NonAuthenticatedMessagesShouldNotBeSigned() throws Exception {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD))
.doesNotContain("Content-Description: S/MIME Cryptographic Signature");
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
index 3f95345..cf92df2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -19,6 +19,7 @@
package org.apache.james.smtp;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.when;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
@@ -54,7 +55,6 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.jayway.awaitility.Duration;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -85,7 +85,7 @@ public class SmtpAuthorizedAddressesTest {
@Before
public void setup() throws Exception {
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
RestAssured.requestSpecification = new RequestSpecBuilder()
.setContentType(ContentType.JSON)
@@ -155,10 +155,10 @@ public class SmtpAuthorizedAddressesTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(FROM, TO);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, TO)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(this::messageIsReceivedByTheSmtpServer);
}
}
@@ -173,7 +173,7 @@ public class SmtpAuthorizedAddressesTest {
SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, TO);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed);
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
}
}
@@ -186,11 +186,10 @@ public class SmtpAuthorizedAddressesTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
- messageSender.sendMessage(FROM, TO);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(FROM, TO)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(this::messageIsReceivedByTheSmtpServer);
}
}
@@ -205,11 +204,10 @@ public class SmtpAuthorizedAddressesTest {
SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(TO, FROM);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(TO, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
index 70364d9..6c9726b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
@@ -19,6 +19,7 @@
package org.apache.james.smtp;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
@@ -40,8 +41,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class SmtpBracketEnforcementTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
@@ -102,8 +101,8 @@ public class SmtpBracketEnforcementTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
- messageSender.sendMessage(USER, USER);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -115,8 +114,8 @@ public class SmtpBracketEnforcementTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
- messageSender.sendMessageNoBracket(USER, USER);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessageNoBracket(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -128,8 +127,8 @@ public class SmtpBracketEnforcementTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
- messageSender.sendMessage(USER, USER);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -142,7 +141,7 @@ public class SmtpBracketEnforcementTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
messageSender.sendMessageNoBracket(USER, USER);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed);
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
index a360625..58a7c05 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.smtp;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
@@ -40,8 +41,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class SmtpIdentityVerificationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
@@ -102,8 +101,8 @@ public class SmtpIdentityVerificationTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
- messageSender.sendMessage(USER, USER);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -116,8 +115,8 @@ public class SmtpIdentityVerificationTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, ATTACKER, ATTACKER_PASSWORD)) {
- messageSender.sendMessage(USER, USER);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -131,7 +130,7 @@ public class SmtpIdentityVerificationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, ATTACKER, ATTACKER_PASSWORD)) {
messageSender.sendMessage(USER, USER);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed);
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
index 40e5873..4bedf38 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.smtp;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
@@ -41,7 +42,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import com.google.common.base.Strings;
-import com.jayway.awaitility.Duration;
public class SmtpSizeLimitationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -105,7 +105,7 @@ public class SmtpSizeLimitationTest {
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
messageSender.sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageSendingFailed);
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
}
}
@@ -118,8 +118,8 @@ public class SmtpSizeLimitationTest {
try (SMTPMessageSender messageSender =
SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
- messageSender.sendMessageWithHeaders(USER, USER,"Short message");
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessageWithHeaders(USER, USER,"Short message")
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
index 5b4f451..6f11b48 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -52,8 +53,6 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class AmqpForwardAttachmentTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -149,8 +148,8 @@ public class AmqpForwardAttachmentTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
}
assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
index 94652f1..268be0b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.transport.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -49,8 +50,6 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class ContactExtractorTest {
public static final String JAMES_ORG = "james.org";
@@ -136,7 +135,7 @@ public class ContactExtractorTest {
IMAPMessageReader imap = new IMAPMessageReader("localhost", 1143)) {
messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE)
+ calmlyAwait.atMost(ONE_MINUTE)
.until(() -> imap.userReceivedMessage(TO, PASSWORD));
Optional<String> actual = amqpRule.readContent();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
index ca7d04a..3aeb402 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -61,7 +62,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.wait.HostPortWaitStrategy;
-import com.jayway.awaitility.Duration;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.specification.RequestSpecification;
@@ -143,7 +143,7 @@ public class GroupMappingTest {
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DOMAIN1);
@@ -183,9 +183,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN1, PASSWORD);
@@ -206,9 +206,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN2, PASSWORD);
@@ -230,10 +230,10 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN2, PASSWORD, 1));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN2, PASSWORD, 1));
}
}
@@ -251,9 +251,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN2, PASSWORD);
@@ -277,9 +277,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
}
}
@@ -295,9 +295,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
}
}
@@ -318,9 +318,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
}
}
@@ -344,9 +344,9 @@ public class GroupMappingTest {
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHaveNotBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD));
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN2, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHaveNotBeenSent);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN2, PASSWORD));
}
}
@@ -364,9 +364,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
}
}
@@ -384,9 +384,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD));
}
}
@@ -404,9 +404,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
}
}
@@ -424,9 +424,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
}
}
@@ -445,9 +445,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(userWithSlash, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(userWithSlash, PASSWORD));
}
}
@@ -465,9 +465,9 @@ public class GroupMappingTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
}
}
@@ -483,8 +483,8 @@ public class GroupMappingTest {
.build();
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
calmlyAwait.atMost(1, TimeUnit.MINUTES)
.until(() -> {
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
index bdc0897..e9249e9 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -57,7 +58,6 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import com.google.common.collect.ImmutableList;
-import com.jayway.awaitility.Duration;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
@@ -575,8 +575,8 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
}
assertThat(amqpRule.readContent()).isEmpty();
@@ -593,8 +593,8 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
}
Optional<String> content = amqpRule.readContent();
@@ -626,9 +626,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
@@ -650,9 +650,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
@@ -673,9 +673,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
@@ -696,9 +696,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
}
Optional<String> content = amqpRule.readContent();
@@ -723,9 +723,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
}
Optional<String> content = amqpRule.readContent();
@@ -751,9 +751,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
@@ -774,9 +774,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
}
Optional<String> content1 = amqpRule.readContent();
@@ -813,9 +813,9 @@ public class ICSAttachmentWorkflowTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
String receivedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
index b741b1f..3efb6eb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -19,6 +19,7 @@
package org.apache.james.transport.mailets;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -48,8 +49,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Duration;
-
public class StripAttachmentTest {
private static final String LOCALHOST_IP = "127.0.0.1";
@@ -140,9 +139,9 @@ public class StripAttachmentTest {
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
String processedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD);
assertThat(processedMessage).contains("Matching attachment");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index 3014fc8..988bb6f 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -36,6 +36,10 @@
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[36/44] james-project git commit: JAMES-2262 Correct Tests for Groups
Posted by bt...@apache.org.
JAMES-2262 Correct Tests for Groups
Webadmin start was not awaited, leading to failing API calls, and failing tests on my local computer.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/51c64ca6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/51c64ca6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/51c64ca6
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 51c64ca62edc03ea014f0120ea7ce7630a297a83
Parents: 85e48ef
Author: benwa <bt...@linagora.com>
Authored: Fri Dec 22 14:44:11 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:38 2018 +0700
----------------------------------------------------------------------
.../apache/james/utils/WebAdminGuiceProbe.java | 4 ++++
.../RecipientRewriteTableIntegrationTest.java | 8 ++++----
.../james/smtp/SmtpAuthorizedAddressesTest.java | 5 ++---
.../james/smtp/SmtpBracketEnforcementTest.java | 4 ++--
.../smtp/SmtpIdentityVerificationTest.java | 4 ++--
.../james/smtp/SmtpSizeLimitationTest.java | 4 ++--
.../transport/mailets/GroupMappingTest.java | 20 +++++++++++---------
.../integration/SetMessagesMethodTest.java | 1 +
.../apache/james/utils/IMAPMessageReader.java | 4 ++++
.../apache/james/utils/SMTPMessageSender.java | 4 ++++
10 files changed, 36 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
index 40cde64..9caa85f 100644
--- a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
+++ b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
@@ -34,4 +34,8 @@ public class WebAdminGuiceProbe implements GuiceProbe {
public int getWebAdminPort() {
return webAdminServer.getPort().get().getValue();
}
+
+ public void await() {
+ webAdminServer.await();
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index 041e001..d6d1162 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -103,8 +103,8 @@ public class RecipientRewriteTableIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage);
+ .select(IMAPMessageReader.INBOX)
+ .awaitNoMessage(awaitOneMinute);
}
@Test
@@ -156,8 +156,8 @@ public class RecipientRewriteTableIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ANY_AT_JAMES, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage);
+ .select(IMAPMessageReader.INBOX)
+ .awaitNoMessage(awaitOneMinute);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/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 4fa53a4..f4940dd 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
@@ -138,9 +138,8 @@ public class SmtpAuthorizedAddressesTest {
.withAutorizedAddresses("172.0.0.0/8"));
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(FROM, TO);
-
- awaitOneMinute.until(messageSender::messageSendingFailed);
+ .sendMessage(FROM, TO)
+ .awaitSentFail(awaitOneMinute);
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/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 ca52508..aeed2bb 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
@@ -102,7 +102,7 @@ public class SmtpBracketEnforcementTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
- .sendMessageNoBracket(USER, USER);
- awaitOneMinute.until(messageSender::messageSendingFailed);
+ .sendMessageNoBracket(USER, USER)
+ .awaitSentFail(awaitOneMinute);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/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 fdf7f7c..1c652d6 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
@@ -97,8 +97,8 @@ public class SmtpIdentityVerificationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(ATTACKER, ATTACKER_PASSWORD)
- .sendMessage(USER, USER);
- awaitOneMinute.until(messageSender::messageSendingFailed);
+ .sendMessage(USER, USER)
+ .awaitSentFail(awaitOneMinute);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/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 1509c26..ff8bed4 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
@@ -72,8 +72,8 @@ public class SmtpSizeLimitationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
- .sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024));
- awaitOneMinute.until(messageSender::messageSendingFailed);
+ .sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024))
+ .awaitSentFail(awaitOneMinute);
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/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 6ae78d3..fb82b8d 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
@@ -131,8 +131,10 @@ public class GroupMappingTest {
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, USER_DOMAIN1, "INBOX");
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, USER_DOMAIN2, "INBOX");
+ WebAdminGuiceProbe webAdminGuiceProbe = jamesServer.getProbe(WebAdminGuiceProbe.class);
+ webAdminGuiceProbe.await();
restApiRequest = RestAssured.given()
- .port(jamesServer.getProbe(WebAdminGuiceProbe.class).getWebAdminPort());
+ .port(webAdminGuiceProbe.getWebAdminPort());
message = MimeMessageBuilder.mimeMessageBuilder()
.setSubject("test")
@@ -274,11 +276,11 @@ public class GroupMappingTest {
.sendMessage( FakeMail.builder()
.mimeMessage(message)
.sender(SENDER)
- .recipient(GROUP_ON_DOMAIN2))
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
+ .login(USER_DOMAIN2, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitOneMinute);
@@ -303,17 +305,17 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(awaitOneMinute);
+ .awaitSentFail(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(awaitOneMinute);
+ .awaitNoMessage(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(awaitOneMinute);
+ .awaitNoMessage(awaitOneMinute);
}
@Test
@@ -350,8 +352,8 @@ public class GroupMappingTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage);
+ .select(IMAPMessageReader.INBOX)
+ .awaitNoMessage(awaitOneMinute);
}
@Test
@@ -426,7 +428,7 @@ public class GroupMappingTest {
.awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
+ .login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitOneMinute);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index adc161f..af217d6 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -4529,6 +4529,7 @@ public abstract class SetMessagesMethodTest {
try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()
.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USERNAME, PASSWORD)
.select(MailboxConstants.INBOX)) {
assertThat(imapMessageReader.readFirstMessage())
.contains("X-MY-MULTIVALUATED-HEADER: first value")
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
index 2d27da0..2f16384 100644
--- a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
+++ b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
@@ -76,6 +76,10 @@ public class IMAPMessageReader extends ExternalResource implements Closeable {
conditionFactory.until(this::hasAMessage);
}
+ public void awaitNoMessage(ConditionFactory conditionFactory) throws IOException {
+ conditionFactory.until(this::userDoesNotReceiveMessage);
+ }
+
public boolean hasAMessageWithFlags(String flags) throws IOException {
imapClient.fetch("1:1", "ALL");
String replyString = imapClient.getReplyString();
http://git-wip-us.apache.org/repos/asf/james-project/blob/51c64ca6/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
index 9370ccd..bb8d982 100644
--- a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
+++ b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
@@ -168,6 +168,10 @@ public class SMTPMessageSender extends ExternalResource implements Closeable {
conditionFactory.until(this::messageHasBeenSent);
}
+ public void awaitSentFail(ConditionFactory conditionFactory) {
+ conditionFactory.until(this::messageSendingFailed);
+ }
+
public boolean messageSendingFailed() throws IOException {
String replyString = smtpClient.getReplyString().trim();
return replyString.startsWith("4") || replyString.startsWith("5");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[10/44] james-project git commit: JAMES-2267 MailetContainer
integration: Provide default value for postmaster
Posted by bt...@apache.org.
JAMES-2267 MailetContainer integration: Provide default value for postmaster
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/623620ee
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/623620ee
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/623620ee
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 623620eef3529c68d69a85f3f5c30625e68ea320
Parents: 7fa62d6
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 11:25:55 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:51 2018 +0700
----------------------------------------------------------------------
.../org/apache/james/mailets/AddDeliveredToHeaderTest.java | 1 -
.../apache/james/mailets/CommonMailetConfigurationTest.java | 1 -
.../apache/james/mailets/NetworkMatcherIntegrationTest.java | 1 -
.../james/mailets/RecipientRewriteTableIntegrationTest.java | 1 -
.../src/test/java/org/apache/james/mailets/SieveDelivery.java | 1 -
.../org/apache/james/mailets/SmtpAuthIntegrationTest.java | 1 -
.../apache/james/mailets/configuration/MailetContainer.java | 7 +++++--
.../james/mailets/crypto/SMIMEDecryptIntegrationTest.java | 1 -
.../apache/james/mailets/crypto/SMIMESignIntegrationTest.java | 1 -
.../org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 2 --
.../org/apache/james/smtp/SmtpBracketEnforcementTest.java | 2 --
.../org/apache/james/smtp/SmtpIdentityVerificationTest.java | 2 --
.../java/org/apache/james/smtp/SmtpSizeLimitationTest.java | 2 --
.../james/transport/mailets/AmqpForwardAttachmentTest.java | 1 -
.../org/apache/james/transport/mailets/GroupMappingTest.java | 1 -
.../james/transport/mailets/ICSAttachmentWorkflowTest.java | 1 -
.../apache/james/transport/mailets/StripAttachmentTest.java | 1 -
17 files changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index fda90d0..662a6df 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -55,7 +55,6 @@ public class AddDeliveredToHeaderTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index ee78589..27c94c2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -54,7 +54,6 @@ public class CommonMailetConfigurationTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index a38c1bf..68af424 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -76,7 +76,6 @@ public class NetworkMatcherIntegrationTest {
private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(rootProcessor)
.addProcessor(CommonProcessors.error())
.addProcessor(deliverOnlyTransport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index 2cf095e..671a6b3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -65,7 +65,6 @@ public class RecipientRewriteTableIntegrationTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 b81e756..bc9b77b 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
@@ -56,7 +56,6 @@ public class SieveDelivery {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 d692395..6c73a27 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
@@ -77,7 +77,6 @@ public class SmtpAuthIntegrationTest {
.build();
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(rootProcessor)
.addProcessor(CommonProcessors.error())
.addProcessor(deliverOnlyTransport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
index 49b4ced..2adbf9e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -36,17 +36,19 @@ public class MailetContainer implements SerializableAsXml {
public static class Builder {
public static final int DEFAULT_THREAD_COUNT = 5;
- private String postmaster;
+ public static final String DEFAULT_POSTMASTER = "postmaster@localhost";
+ private Optional<String> postmaster;
private Optional<Integer> threads;
private ImmutableList.Builder<ProcessorConfiguration> processors;
private Builder() {
processors = ImmutableList.builder();
threads = Optional.empty();
+ postmaster = Optional.empty();
}
public Builder postmaster(String postmaster) {
- this.postmaster = postmaster;
+ this.postmaster = Optional.of(postmaster);
return this;
}
@@ -66,6 +68,7 @@ public class MailetContainer implements SerializableAsXml {
}
public MailetContainer build() {
+ String postmaster = this.postmaster.orElse(DEFAULT_POSTMASTER);
int threads = this.threads.orElse(DEFAULT_THREAD_COUNT);
Preconditions.checkState(!Strings.isNullOrEmpty(postmaster), "'postmaster' is mandatory");
Preconditions.checkState(threads > 0, "'threads' should be greater than 0");
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 7663084..7739eaf 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
@@ -72,7 +72,6 @@ public class SMIMEDecryptIntegrationTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 1ea352f..a6c3208 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
@@ -78,7 +78,6 @@ public class SMIMESignIntegrationTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 9377887..800262c 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
@@ -61,7 +61,6 @@ import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
public class SmtpAuthorizedAddressesTest {
- private static final String DEFAULT_DOMAIN = "james.org";
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
public static final int IMAP_PORT = 1143;
@@ -108,7 +107,6 @@ public class SmtpAuthorizedAddressesTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 b1e6af9..4db4a87 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
@@ -44,7 +44,6 @@ import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
public class SmtpBracketEnforcementTest {
- private static final String DEFAULT_DOMAIN = "james.org";
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
private static final String PASSWORD = "secret";
@@ -71,7 +70,6 @@ public class SmtpBracketEnforcementTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 3a22a07..c1890e9 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
@@ -44,7 +44,6 @@ import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
public class SmtpIdentityVerificationTest {
- private static final String DEFAULT_DOMAIN = "james.org";
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
private static final String PASSWORD = "secret";
@@ -73,7 +72,6 @@ public class SmtpIdentityVerificationTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 1be05cb..295021b 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
@@ -45,7 +45,6 @@ import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
public class SmtpSizeLimitationTest {
- private static final String DEFAULT_DOMAIN = "james.org";
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
private static final String PASSWORD = "secret";
@@ -72,7 +71,6 @@ public class SmtpSizeLimitationTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 ea2f222..0d4597b 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
@@ -88,7 +88,6 @@ public class AmqpForwardAttachmentTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 438ad12..69362eb 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
@@ -108,7 +108,6 @@ public class GroupMappingTest {
inMemoryDNSService.registerRecord("yopmail.com", containerIp, "yopmail.com");
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + DOMAIN1)
.addProcessor(ProcessorConfiguration.root()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 09f6b50..c6be395 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
@@ -454,7 +454,6 @@ public class ICSAttachmentWorkflowTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/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 478a1df..15b7bff 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
@@ -72,7 +72,6 @@ public class StripAttachmentTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[24/44] james-project git commit: JAMES-2267 MessageSender should be
a test rule
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
index 14173f9..f719c3e 100644
--- a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
+++ b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
@@ -31,18 +31,26 @@ import javax.mail.Message;
import javax.mail.MessagingException;
import org.apache.commons.net.smtp.AuthenticatingSMTPClient;
-import org.apache.commons.net.smtp.SMTPClient;
import org.apache.james.core.MailAddress;
import org.apache.mailet.Mail;
+import org.junit.rules.ExternalResource;
import com.github.fge.lambdas.Throwing;
import com.google.common.base.Throwables;
import com.jayway.awaitility.core.ConditionFactory;
-public class SMTPMessageSender implements Closeable {
+public class SMTPMessageSender extends ExternalResource implements Closeable {
+
+ private static AuthenticatingSMTPClient createClient() {
+ try {
+ return new AuthenticatingSMTPClient();
+ } catch (NoSuchAlgorithmException e) {
+ throw Throwables.propagate(e);
+ }
+ }
public static SMTPMessageSender noAuthentication(String ip, int port, String senderDomain) throws IOException {
- SMTPClient smtpClient = new SMTPClient();
+ AuthenticatingSMTPClient smtpClient = createClient();
smtpClient.connect(ip, port);
return new SMTPMessageSender(smtpClient, senderDomain);
}
@@ -57,14 +65,30 @@ public class SMTPMessageSender implements Closeable {
return new SMTPMessageSender(smtpClient, senderDomain);
}
- private final SMTPClient smtpClient;
+ private final AuthenticatingSMTPClient smtpClient;
private final String senderDomain;
- private SMTPMessageSender(SMTPClient smtpClient, String senderDomain) {
+ private SMTPMessageSender(AuthenticatingSMTPClient smtpClient, String senderDomain) {
this.smtpClient = smtpClient;
this.senderDomain = senderDomain;
}
+ public SMTPMessageSender(String senderDomain) {
+ this(createClient(), senderDomain);
+ }
+
+ public SMTPMessageSender connect(String ip, int port) throws IOException {
+ smtpClient.connect(ip, port);
+ return this;
+ }
+
+ public SMTPMessageSender authenticate(String username, String password) throws IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
+ if (smtpClient.auth(AuthenticatingSMTPClient.AUTH_METHOD.PLAIN, username, password) == false) {
+ throw new RuntimeException("auth failed");
+ }
+ return this;
+ }
+
public SMTPMessageSender sendMessage(String from, String recipient) {
try {
smtpClient.helo(senderDomain);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[02/44] james-project git commit: JAMES-2267 Bcc stripper is a common
mailet
Posted by bt...@apache.org.
JAMES-2267 Bcc stripper is a common mailet
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2e143522
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2e143522
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2e143522
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 2e1435227ca00ed0f706e0cf7cafa915043ba77f
Parents: 3e6b057
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 10:58:59 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:50 2018 +0700
----------------------------------------------------------------------
.../org/apache/james/mailets/BounceIntegrationTest.java | 6 +-----
.../mailets/GatewayRemoteDeliveryIntegrationTest.java | 10 ++--------
.../james/mailets/NetworkMatcherIntegrationTest.java | 6 +-----
.../org/apache/james/mailets/SmtpAuthIntegrationTest.java | 6 +-----
.../james/mailets/configuration/CommonProcessors.java | 6 +-----
.../james/mailets/configuration/MailetConfiguration.java | 8 ++++++++
.../james/mailets/crypto/SMIMEDecryptIntegrationTest.java | 6 +-----
.../james/mailets/crypto/SMIMESignIntegrationTest.java | 6 +-----
.../apache/james/smtp/SmtpAuthorizedAddressesTest.java | 6 +-----
.../org/apache/james/smtp/SmtpBracketEnforcementTest.java | 6 +-----
.../apache/james/smtp/SmtpIdentityVerificationTest.java | 6 +-----
.../org/apache/james/smtp/SmtpSizeLimitationTest.java | 6 +-----
.../transport/mailets/AmqpForwardAttachmentTest.java | 5 +----
.../james/transport/mailets/ContactExtractorTest.java | 5 +----
.../apache/james/transport/mailets/GroupMappingTest.java | 5 +----
.../transport/mailets/ICSAttachmentWorkflowTest.java | 5 +----
.../james/transport/mailets/StripAttachmentTest.java | 5 +----
17 files changed, 25 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 919fb35..1d0c2a9 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
@@ -33,7 +33,6 @@ import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.NotifyPostmaster;
import org.apache.james.transport.mailets.NotifySender;
import org.apache.james.transport.mailets.Redirect;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.Resend;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
@@ -260,10 +259,7 @@ public class BounceIntegrationTest {
// Other recipients will be bouncing
return ProcessorConfiguration.builder()
.state("transport")
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(VacationMailet.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 9df8289..0f07481 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -410,10 +410,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
return ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class))
@@ -435,10 +432,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
return ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index e5750bb..d9fb2fd 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -28,7 +28,6 @@ import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.mailets.ToRepository;
import org.apache.james.transport.matchers.All;
@@ -97,10 +96,7 @@ public class NetworkMatcherIntegrationTest {
private ProcessorConfiguration deliverOnlyTransport() {
return ProcessorConfiguration.builder()
.state("transport")
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(LocalDelivery.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 19393a7..012334c 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
@@ -28,7 +28,6 @@ import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.mailets.ToRepository;
import org.apache.james.transport.matchers.All;
@@ -108,10 +107,7 @@ public class SmtpAuthIntegrationTest {
return ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(LocalDelivery.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index 9f52fc3..0af0d61 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -29,7 +29,6 @@ import org.apache.james.transport.mailets.Null;
import org.apache.james.transport.mailets.PostmasterAlias;
import org.apache.james.transport.mailets.RecipientRewriteTable;
import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.SetMailAttribute;
import org.apache.james.transport.mailets.SetMimeHeader;
import org.apache.james.transport.mailets.Sieve;
@@ -125,10 +124,7 @@ public class CommonProcessors {
.mailet(SetMimeHeader.class)
.addProperty("name", "X-WasSigned")
.addProperty("value", "true"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RecipientRewriteTable.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
index ae91bc4..ead2e08 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
@@ -23,6 +23,8 @@ package org.apache.james.mailets.configuration;
import java.util.Map;
import java.util.Optional;
+import org.apache.james.transport.mailets.RemoveMimeHeader;
+import org.apache.james.transport.matchers.All;
import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
@@ -75,6 +77,12 @@ public class MailetConfiguration implements SerializableAsXml {
}
}
+ public static final MailetConfiguration BCC_STRIPPER = MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(RemoveMimeHeader.class)
+ .addProperty("name", "bcc")
+ .build();
+
private final Class<? extends Matcher> matcher;
private final Optional<String> matcherCondition;
private final Class<? extends Mailet> mailet;
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 05e6318..9b4a13c 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
@@ -34,7 +34,6 @@ import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.SMIMEDecrypt;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
@@ -80,10 +79,7 @@ public class SMIMEDecryptIntegrationTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.mailet(SMIMEDecrypt.class)
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 2d86d4d..1fad706 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
@@ -35,7 +35,6 @@ import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.RecipientRewriteTable;
import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.SMIMESign;
import org.apache.james.transport.mailets.SetMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
@@ -97,10 +96,7 @@ public class SMIMESignIntegrationTest {
.mailet(SetMimeHeader.class)
.addProperty("name", "X-WasSigned")
.addProperty("value", "true"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RecipientRewriteTable.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 052df4d..d0cdcaa 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
@@ -37,7 +37,6 @@ import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
@@ -121,10 +120,7 @@ public class SmtpAuthorizedAddressesTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 4507903..51e33e8 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
@@ -28,7 +28,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
@@ -84,10 +83,7 @@ public class SmtpBracketEnforcementTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 61ebd81..9317282 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
@@ -28,7 +28,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
@@ -86,10 +85,7 @@ public class SmtpIdentityVerificationTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class)))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 c477575..73a4426 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
@@ -28,7 +28,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
@@ -85,10 +84,7 @@ public class SmtpSizeLimitationTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 15d5daf..054ec81 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
@@ -95,10 +95,7 @@ public class AmqpForwardAttachmentTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 c348e06..8429a6e 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
@@ -96,10 +96,7 @@ public class ContactExtractorTest {
.addProperty(AmqpForwardAttribute.URI_PARAMETER_NAME, amqpRule.getAmqpUri())
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE)
.addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, attribute))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(VacationMailet.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 8f78d83..ae536f9 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
@@ -131,10 +131,7 @@ public class GroupMappingTest {
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RecipientRewriteTable.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 00d7051..cdafabc 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
@@ -461,10 +461,7 @@ public class ICSAttachmentWorkflowTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e143522/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 76f2a0a..bc13e9a 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
@@ -79,10 +79,7 @@ public class StripAttachmentTest {
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
.enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[27/44] james-project git commit: JAMES-2267 Constant for
calmlyAwait.atMost(ONE_MINUTE)
Posted by bt...@apache.org.
JAMES-2267 Constant for calmlyAwait.atMost(ONE_MINUTE)
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/28eb15b3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/28eb15b3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/28eb15b3
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 28eb15b3e3a1c300d8055908b8a2a5384745b1b1
Parents: 7354cf0
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 09:23:37 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 7 +-
.../james/mailets/BounceIntegrationTest.java | 17 +++--
.../mailets/CommonMailetConfigurationTest.java | 7 +-
.../GatewayRemoteDeliveryIntegrationTest.java | 19 +++---
.../mailets/NetworkMatcherIntegrationTest.java | 35 +++++-----
.../RecipientRewriteTableIntegrationTest.java | 28 ++++----
.../org/apache/james/mailets/SieveDelivery.java | 7 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 11 ++--
.../james/mailets/configuration/Constants.java | 6 +-
.../crypto/SMIMEDecryptIntegrationTest.java | 15 ++---
.../crypto/SMIMESignIntegrationTest.java | 11 ++--
.../james/smtp/SmtpAuthorizedAddressesTest.java | 20 +++---
.../james/smtp/SmtpBracketEnforcementTest.java | 11 ++--
.../smtp/SmtpIdentityVerificationTest.java | 9 ++-
.../james/smtp/SmtpSizeLimitationTest.java | 7 +-
.../mailets/AmqpForwardAttachmentTest.java | 7 +-
.../transport/mailets/ContactExtractorTest.java | 7 +-
.../transport/mailets/GroupMappingTest.java | 68 ++++++++++----------
.../mailets/ICSAttachmentWorkflowTest.java | 43 ++++++-------
.../transport/mailets/StripAttachmentTest.java | 7 +-
20 files changed, 163 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index 36f95da..e95be9e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -19,7 +19,6 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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;
@@ -27,7 +26,7 @@ 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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.probe.DataProbe;
@@ -69,12 +68,12 @@ public class AddDeliveredToHeaderTest {
public void receivedMessagesShouldContainDeliveredToHeaders() throws Exception {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessageHeaders())
.contains(AddDeliveredToHeader.DELIVERED_TO + ": " + RECIPIENT);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 6d8c1cf..f3fd032 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
@@ -19,14 +19,13 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.RECIPIENT;
import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
-import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -94,7 +93,7 @@ public class BounceIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -119,7 +118,7 @@ public class BounceIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -144,7 +143,7 @@ public class BounceIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -170,7 +169,7 @@ public class BounceIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -196,7 +195,7 @@ public class BounceIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -221,7 +220,7 @@ public class BounceIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -246,7 +245,7 @@ public class BounceIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(POSTMASTER, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
private MailetContainer generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 7f13bc8..92d4fb3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -19,7 +19,6 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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;
@@ -27,7 +26,7 @@ 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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
@@ -70,11 +69,11 @@ public class CommonMailetConfigurationTest {
public void simpleMailShouldBeSent() throws Exception {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 34a44e4..f6bf420 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -19,7 +19,6 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.when;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
@@ -30,7 +29,7 @@ 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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -95,7 +94,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Before
public void setup() throws Exception {
- calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
RestAssured.requestSpecification = new RequestSpecBuilder()
.setContentType(ContentType.JSON)
@@ -129,7 +128,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -148,7 +147,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -167,7 +166,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -186,7 +185,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -244,7 +243,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -292,7 +291,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -319,7 +318,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
}
private boolean messageIsReceivedByTheSmtpServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index f02ab31..40d5197 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -19,13 +19,12 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.MemoryJamesServerMain;
@@ -111,12 +110,12 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -132,12 +131,12 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -153,12 +152,12 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -174,12 +173,12 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -195,12 +194,12 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -216,12 +215,12 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -237,10 +236,10 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ awaitOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
assertThat(
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
@@ -262,10 +261,10 @@ public class NetworkMatcherIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ awaitOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
assertThat(
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index ea0773e..c07852a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -19,13 +19,12 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
@@ -60,7 +59,6 @@ public class RecipientRewriteTableIntegrationTest {
private TemporaryJamesServer jamesServer;
private DataProbe dataProbe;
-
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
@@ -86,16 +84,16 @@ public class RecipientRewriteTableIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ANY_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(OTHER_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -110,12 +108,12 @@ public class RecipientRewriteTableIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
+ awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage);
}
@Test
@@ -131,16 +129,16 @@ public class RecipientRewriteTableIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(localUser, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(OTHER_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -151,12 +149,12 @@ public class RecipientRewriteTableIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, ANY_AT_JAMES)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ANY_AT_ANOTHER_DOMAIN, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -167,12 +165,12 @@ public class RecipientRewriteTableIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, ANY_AT_JAMES)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ANY_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
+ awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage);
}
private void createUserInbox(String username) throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 14538a6..1b7b524 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
@@ -19,7 +19,6 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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;
@@ -27,7 +26,7 @@ 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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
@@ -80,11 +79,11 @@ public class SieveDelivery {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(TARGETED_MAILBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 624edae..6f6f9db 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
@@ -19,13 +19,12 @@
package org.apache.james.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.MemoryJamesServerMain;
@@ -124,21 +123,21 @@ public class SmtpAuthIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ awaitOneMinute.until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
assertThat(
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 7c16fbb..c4c902b 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
@@ -19,18 +19,22 @@
package org.apache.james.mailets.configuration;
+import static com.jayway.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
+
import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
public class Constants {
- public static Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
+ public static Duration slowPacedPollInterval = FIVE_HUNDRED_MILLISECONDS;
public static ConditionFactory calmlyAwait = Awaitility.with()
.pollInterval(slowPacedPollInterval)
.and()
.with()
.pollDelay(slowPacedPollInterval)
.await();
+ public static ConditionFactory awaitOneMinute = calmlyAwait.atMost(ONE_MINUTE);
public static final String DEFAULT_DOMAIN = "james.org";
public static final String LOCALHOST_IP = "127.0.0.1";
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 d02e901..e267fc3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
@@ -19,11 +19,10 @@
package org.apache.james.mailets.crypto;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -111,12 +110,12 @@ public class SMIMEDecryptIntegrationTest {
.authenticate(FROM, PASSWORD)
.sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessage()).containsSequence("Crypted content");
}
@@ -126,12 +125,12 @@ public class SMIMEDecryptIntegrationTest {
.authenticate(FROM, PASSWORD)
.sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessage())
.containsSequence("Crypted Content with attachment");
}
@@ -142,12 +141,12 @@ public class SMIMEDecryptIntegrationTest {
.authenticate(FROM, PASSWORD)
.sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessage())
.containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 d13c5ac..4c67734 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -19,12 +19,11 @@
package org.apache.james.mailets.crypto;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import java.time.ZonedDateTime;
@@ -124,12 +123,12 @@ public class SMIMESignIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ awaitOneMinute.until(imapMessageReader::hasAMessage);
assertThat(imapMessageReader.readFirstMessage())
.containsSequence("Content-Description: S/MIME Cryptographic Signature");
}
@@ -138,12 +137,12 @@ public class SMIMESignIntegrationTest {
public void NonAuthenticatedMessagesShouldNotBeSigned() throws Exception {
messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ awaitOneMinute.until(imapMessageReader::hasAMessage);
assertThat(imapMessageReader.readFirstMessage())
.doesNotContain("Content-Description: S/MIME Cryptographic Signature");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 2bc721b..d70df3c 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -19,7 +19,6 @@
package org.apache.james.smtp;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.when;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
@@ -28,7 +27,7 @@ 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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -88,7 +87,7 @@ public class SmtpAuthorizedAddressesTest {
@Before
public void setup() throws Exception {
- calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
RestAssured.requestSpecification = new RequestSpecBuilder()
.setContentType(ContentType.JSON)
@@ -157,10 +156,9 @@ public class SmtpAuthorizedAddressesTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, TO)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
- calmlyAwait.atMost(ONE_MINUTE)
- .until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -172,7 +170,7 @@ public class SmtpAuthorizedAddressesTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, TO);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
+ awaitOneMinute.until(messageSender::messageSendingFailed);
}
@Test
@@ -184,9 +182,9 @@ public class SmtpAuthorizedAddressesTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(FROM, PASSWORD)
.sendMessage(FROM, TO)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
+ awaitOneMinute.until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -197,12 +195,12 @@ public class SmtpAuthorizedAddressesTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(TO, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
private boolean messageIsReceivedByTheSmtpServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 14f9505..1ceafc3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
@@ -19,12 +19,11 @@
package org.apache.james.smtp;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -102,7 +101,7 @@ public class SmtpBracketEnforcementTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
.sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
}
@Test
@@ -113,7 +112,7 @@ public class SmtpBracketEnforcementTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
.sendMessageNoBracket(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
}
@Test
@@ -124,7 +123,7 @@ public class SmtpBracketEnforcementTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
.sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
}
@Test
@@ -135,6 +134,6 @@ public class SmtpBracketEnforcementTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
.sendMessageNoBracket(USER, USER);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
+ awaitOneMinute.until(messageSender::messageSendingFailed);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 1217df5..fdf6e7e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
@@ -19,12 +19,11 @@
package org.apache.james.smtp;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -102,7 +101,7 @@ public class SmtpIdentityVerificationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD).sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
}
@Test
@@ -114,7 +113,7 @@ public class SmtpIdentityVerificationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(ATTACKER, ATTACKER_PASSWORD)
.sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
}
@Test
@@ -126,7 +125,7 @@ public class SmtpIdentityVerificationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(ATTACKER, ATTACKER_PASSWORD)
.sendMessage(USER, USER);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
+ awaitOneMinute.until(messageSender::messageSendingFailed);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 f2bb893..cc3b9eb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
@@ -19,12 +19,11 @@
package org.apache.james.smtp;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -105,7 +104,7 @@ public class SmtpSizeLimitationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
.sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024));
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
+ awaitOneMinute.until(messageSender::messageSendingFailed);
}
@Test
@@ -117,6 +116,6 @@ public class SmtpSizeLimitationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(USER, PASSWORD)
.sendMessageWithHeaders(USER, USER,"Short message")
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 3e5ce99..c3fb08d 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -19,13 +19,12 @@
package org.apache.james.transport.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -142,12 +141,12 @@ public class AmqpForwardAttachmentTest {
.mimeMessage(message)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 2ef708b..8afe671 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -18,14 +18,13 @@
****************************************************************/
package org.apache.james.transport.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
import static org.apache.james.mailets.configuration.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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
@@ -132,12 +131,12 @@ public class ContactExtractorTest {
.mimeMessage(message)
.sender(SENDER)
.recipients(TO, TO2, CC, CC2, BCC, BCC2))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(TO, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
Optional<String> actual = amqpRule.readContent();
assertThat(actual).isNotEmpty();
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 c672f85..7e1d3ee 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -19,13 +19,13 @@
package org.apache.james.transport.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.mailets.configuration.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.awaitOneMinute;
import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -145,7 +145,7 @@ public class GroupMappingTest {
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DOMAIN1);
@@ -182,12 +182,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@@ -200,12 +200,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN2, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@@ -220,16 +220,16 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN2, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -243,12 +243,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN2, PASSWORD)
.select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ awaitOneMinute.until(imapMessageReader::hasAMessage);
assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@@ -265,12 +265,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -282,12 +282,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipients(GROUP_ON_DOMAIN1, USER_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -303,17 +303,17 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN2))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -331,17 +331,17 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -355,12 +355,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN2, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -374,12 +374,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
+ awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage);
}
@Test
@@ -393,12 +393,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient((GROUP_ON_DOMAIN1)))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN2, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -412,12 +412,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(groupWithSlash))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -432,12 +432,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(userWithSlash, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -451,12 +451,12 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN2, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
}
@Test
@@ -469,7 +469,7 @@ public class GroupMappingTest {
.mimeMessage(message)
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
calmlyAwait.atMost(1, TimeUnit.MINUTES)
.until(() -> {
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 59d4a37..9930c29 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -19,13 +19,12 @@
package org.apache.james.transport.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -569,12 +568,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithoutICSAttached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(amqpRule.readContent()).isEmpty();
}
@@ -586,12 +585,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithICSAttached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
Optional<String> content = amqpRule.readContent();
assertThat(content).isPresent();
@@ -619,12 +618,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithoutICSAttached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).doesNotContain("X-MEETING-UID");
@@ -641,12 +640,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithICSAttached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
@@ -662,12 +661,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithICSBase64Attached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_BASE64_UID);
@@ -683,12 +682,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithICSBase64Attached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
Optional<String> content = amqpRule.readContent();
assertThat(content).isPresent();
@@ -709,12 +708,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(yahooInvitationMessage)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
Optional<String> content = amqpRule.readContent();
assertThat(content).isPresent();
@@ -736,12 +735,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithThreeICSAttached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
@@ -757,12 +756,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(messageWithThreeICSAttached)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
Optional<String> content1 = amqpRule.readContent();
assertThat(content1).isPresent();
@@ -796,12 +795,12 @@ public class ICSAttachmentWorkflowTest {
.mimeMessage(calendarMessage)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessage())
.containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/28eb15b3/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 dd99994..b88a6a7 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -19,13 +19,12 @@
package org.apache.james.transport.mailets;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
+import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
@@ -134,12 +133,12 @@ public class StripAttachmentTest {
.mimeMessage(message)
.sender(FROM)
.recipient(RECIPIENT))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ .awaitMessage(awaitOneMinute);
assertThat(imapMessageReader.readFirstMessage()).contains("Matching attachment");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[17/44] james-project git commit: JAMES-2267 ImapMessageReader should
be a test rule
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index 93a7da5..504593c 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -4527,8 +4527,10 @@ public abstract class SetMessagesMethodTest {
calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken));
- try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT);) {
- assertThat(imapMessageReader.readFirstMessageHeadersInInbox(USERNAME, PASSWORD))
+ try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()
+ .connect(LOCALHOST_IP, IMAP_PORT)
+ .select(MailboxConstants.INBOX)) {
+ assertThat(imapMessageReader.readFirstMessage())
.contains("X-MY-MULTIVALUATED-HEADER: first value")
.contains("X-MY-MULTIVALUATED-HEADER: second value");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
index 744eee3..048e469 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
@@ -53,58 +53,61 @@ public class ImapStepdefs {
@Then("^the user has a IMAP message in mailbox \"([^\"]*)\"$")
public void hasMessageInMailbox(String mailbox) throws Throwable {
- try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT)) {
- assertThat(
- imapMessageReader.userReceivedMessageInMailbox(userStepdefs.getConnectedUser(),
- userStepdefs.getUserPassword(userStepdefs.getConnectedUser()),
- mailbox))
- .isTrue();
+ try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()
+ .connect(LOCALHOST, IMAP_PORT)
+ .login(userStepdefs.getConnectedUser(),
+ userStepdefs.getUserPassword(userStepdefs.getConnectedUser()))
+ .select(mailbox)) {
+ assertThat(imapMessageReader.hasAMessage()).isTrue();
}
}
@Then("^the message has IMAP flag \"([^\"]*)\" in mailbox \"([^\"]*)\" for \"([^\"]*)\"$")
public void hasMessageWithFlagInMailbox(String flags, String mailbox, String username) throws Throwable {
- try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT)) {
- assertThat(
- imapMessageReader.userReceivedMessageWithFlagsInMailbox(username,
- userStepdefs.getUserPassword(username),
- mailbox,
- flags))
+ try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()
+ .connect(LOCALHOST, IMAP_PORT)
+ .login(userStepdefs.getConnectedUser(),
+ userStepdefs.getUserPassword(username))
+ .select(mailbox)) {
+ assertThat(imapMessageReader.hasAMessageWithFlags(flags))
.isTrue();
}
}
@Then("^the user has a IMAP notification about (\\d+) new message when selecting mailbox \"([^\"]*)\"$")
public void hasANotificationAboutNewMessagesInMailbox(int numOfNewMessage, String mailbox) throws Throwable {
- try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT)) {
+ try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()
+ .connect(LOCALHOST, IMAP_PORT)
+ .login(userStepdefs.getConnectedUser(),
+ userStepdefs.getUserPassword(userStepdefs.getConnectedUser()))
+ .select(mailbox)) {
assertThat(
- imapMessageReader.userGetNotifiedForNewMessagesWhenSelectingMailbox(userStepdefs.getConnectedUser(),
- userStepdefs.getUserPassword(userStepdefs.getConnectedUser()),
- numOfNewMessage, mailbox))
+ imapMessageReader.userGetNotifiedForNewMessagesWhenSelectingMailbox(numOfNewMessage))
.isTrue();
}
}
@Then("^the user does not have a IMAP message in mailbox \"([^\"]*)\"$")
public void hasNoMessageInMailbox(String mailbox) throws Throwable {
- try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT)) {
- assertThat(
- imapMessageReader.userDoesNotReceiveMessageInMailbox(userStepdefs.getConnectedUser(),
- userStepdefs.getUserPassword(userStepdefs.getConnectedUser()),
- mailbox))
+ try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()
+ .connect(LOCALHOST, IMAP_PORT)
+ .login(userStepdefs.getConnectedUser(),
+ userStepdefs.getUserPassword(userStepdefs.getConnectedUser()))
+ .select(mailbox)) {
+ assertThat(imapMessageReader.userDoesNotReceiveMessage())
.isTrue();
}
}
@Given("^the user has an open IMAP connection with mailbox \"([^\"]*)\" selected")
public void openImapConnectionAndSelectMailbox(String mailbox) throws Throwable {
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT);
-
String login = userStepdefs.getConnectedUser();
String password = userStepdefs.getUserPassword(login);
- imapMessageReader.connectAndSelect(login, password, mailbox);
- imapConnections.put(mailbox, imapMessageReader);
+ imapConnections.put(mailbox, new IMAPMessageReader()
+ .connect(LOCALHOST, IMAP_PORT)
+ .login(login, password)
+ .select(mailbox));
}
@Then("^the user set flags via IMAP to \"([^\"]*)\" for all messages in mailbox \"([^\"]*)\"$")
@@ -123,12 +126,13 @@ public class ImapStepdefs {
@When("^the user copy by IMAP first message of \"([^\"]*)\" to mailbox \"([^\"]*)\"$")
public void copyAMessageByIMAP(String srcMailbox, String destMailbox) throws Throwable {
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT);
-
String login = userStepdefs.getConnectedUser();
String password = userStepdefs.getUserPassword(login);
- imapMessageReader.connectAndSelect(login, password, srcMailbox);
+ IMAPMessageReader imapMessageReader = new IMAPMessageReader()
+ .connect(LOCALHOST, IMAP_PORT)
+ .login(login, password)
+ .select(srcMailbox);
assertThat(imapMessageReader).isNotNull();
imapMessageReader.copyFirstMessage(destMailbox);
mainStepdefs.awaitMethod.run();
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
index 4b28106..2d27da0 100644
--- a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
+++ b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java
@@ -23,14 +23,17 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.List;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.net.imap.IMAPClient;
+import org.junit.rules.ExternalResource;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Splitter;
+import com.jayway.awaitility.core.ConditionFactory;
-public class IMAPMessageReader implements Closeable {
+public class IMAPMessageReader extends ExternalResource implements Closeable {
- private static final String INBOX = "INBOX";
+ public static final String INBOX = "INBOX";
private final IMAPClient imapClient;
@@ -39,40 +42,41 @@ public class IMAPMessageReader implements Closeable {
this.imapClient = imapClient;
}
- public IMAPMessageReader(String host, int port) throws IOException {
- imapClient = new IMAPClient();
+ public IMAPMessageReader() {
+ this(new IMAPClient());
+ }
+
+ public IMAPMessageReader connect(String host, int port) throws IOException {
imapClient.connect(host, port);
+ return this;
}
- public void connectAndSelect(String user, String password, String mailbox) throws IOException{
+ public IMAPMessageReader login(String user, String password) throws IOException{
imapClient.login(user, password);
- imapClient.select(mailbox);
+ return this;
}
- public boolean countReceivedMessage(String user, String password, int numberOfMessages) throws IOException {
- return countReceivedMessageInMailbox(user, password, INBOX, numberOfMessages);
+ public IMAPMessageReader select(String mailbox) throws IOException {
+ imapClient.select(mailbox);
+ return this;
}
- public boolean countReceivedMessageInMailbox(String user, String password, String mailbox, int numberOfMessages) throws IOException {
- connectAndSelect(user, password, mailbox);
-
+ public boolean hasMessageCount(int numberOfMessages) throws IOException {
return imapClient.getReplyString()
.contains(numberOfMessages + " EXISTS");
}
- public boolean userReceivedMessage(String user, String password) throws IOException {
- return userReceivedMessageInMailbox(user, password, INBOX);
- }
-
- public boolean userReceivedMessageInMailbox(String user, String password, String mailbox) throws IOException {
- connectAndSelect(user, password, mailbox);
+ public boolean hasAMessage() throws IOException {
imapClient.fetch("1:1", "ALL");
return imapClient.getReplyString()
.contains("OK FETCH completed");
}
- public boolean userReceivedMessageWithFlagsInMailbox(String user, String password, String mailbox, String flags) throws IOException {
- connectAndSelect(user, password, mailbox);
+ public void awaitMessage(ConditionFactory conditionFactory) throws IOException {
+ conditionFactory.until(this::hasAMessage);
+ }
+
+ public boolean hasAMessageWithFlags(String flags) throws IOException {
imapClient.fetch("1:1", "ALL");
String replyString = imapClient.getReplyString();
return isCompletedWithFlags(flags, replyString);
@@ -87,34 +91,22 @@ public class IMAPMessageReader implements Closeable {
.allMatch(s -> replyString.contains(s));
}
- public boolean userGetNotifiedForNewMessagesWhenSelectingMailbox(String user, String password, int numOfNewMessage, String mailboxName) throws IOException {
- connectAndSelect(user, password, mailboxName);
-
+ public boolean userGetNotifiedForNewMessagesWhenSelectingMailbox(int numOfNewMessage) throws IOException {
return imapClient.getReplyString().contains("OK [UNSEEN " + numOfNewMessage +"]");
}
- public boolean userDoesNotReceiveMessage(String user, String password) throws IOException {
- return userDoesNotReceiveMessageInMailbox(user, password, INBOX);
- }
-
- public boolean userDoesNotReceiveMessageInMailbox(String user, String password, String mailboxName) throws IOException {
- connectAndSelect(user, password, mailboxName);
+ public boolean userDoesNotReceiveMessage() throws IOException {
imapClient.fetch("1:1", "ALL");
return imapClient.getReplyString()
.contains("BAD FETCH failed. Invalid messageset");
}
- public String readFirstMessageInInbox(String user, String password) throws IOException {
-
- return readFirstMessageInMailbox(user, password, "(BODY[])", INBOX);
- }
-
- public String readFirstMessageHeadersInMailbox(String user, String password, String mailboxName) throws IOException {
- return readFirstMessageInMailbox(user, password, "(RFC822.HEADER)", mailboxName);
+ public String readFirstMessage() throws IOException {
+ return readFirstMessageInMailbox("(BODY[])");
}
- public String readFirstMessageHeadersInInbox(String user, String password) throws IOException {
- return readFirstMessageInMailbox(user, password, "(RFC822.HEADER)", INBOX);
+ public String readFirstMessageHeaders() throws IOException {
+ return readFirstMessageInMailbox("(RFC822.HEADER)");
}
public String setFlagsForAllMessagesInMailbox(String flag) throws IOException {
@@ -122,9 +114,7 @@ public class IMAPMessageReader implements Closeable {
return imapClient.getReplyString();
}
- private String readFirstMessageInMailbox(String user, String password, String parameters, String mailboxName) throws IOException {
- imapClient.login(user, password);
- imapClient.select(mailboxName);
+ private String readFirstMessageInMailbox(String parameters) throws IOException {
imapClient.fetch("1:1", parameters);
return imapClient.getReplyString();
}
@@ -159,7 +149,14 @@ public class IMAPMessageReader implements Closeable {
@Override
public void close() throws IOException {
- imapClient.close();
+ if (imapClient.isConnected()) {
+ imapClient.close();
+ }
+ }
+
+ @Override
+ protected void after() {
+ IOUtils.closeQuietly(this);
}
public void copyFirstMessage(String destMailbox) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[28/44] james-project git commit: JAMES-2267 Introduce an helper to
limit system resources type conversions
Posted by bt...@apache.org.
JAMES-2267 Introduce an helper to limit system resources type conversions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d6fade96
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d6fade96
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d6fade96
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: d6fade96b449b149d448daa4a299317158c194b6
Parents: c20d434
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 10:09:13 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
mailbox/api/pom.xml | 4 +++
.../james/mailbox/model/AttachmentIdTest.java | 6 ++--
.../james/mailbox/cassandra/ids/BlobIdTest.java | 6 ++--
.../json/IndexableMessageTest.java | 21 ++++++------
.../json/MessageToElasticSearchJsonTest.java | 23 +++++++------
.../search/AbstractMessageSearchIndexTest.java | 4 +--
.../mailets/ICALToJsonAttributeTest.java | 28 ++++++++--------
.../transport/mailets/ICalendarParserTest.java | 4 +--
.../james/transport/mailets/model/ICALTest.java | 17 +++++-----
.../org/apache/james/util/ClassLoaderUtils.java | 35 ++++++++++++++++++++
.../crypto/SMIMEDecryptIntegrationTest.java | 9 +++--
.../integration/GetMessageListMethodTest.java | 6 ++--
.../integration/SetMessagesMethodTest.java | 7 ++--
.../james/jmap/model/MessageFactoryTest.java | 5 ++-
.../integration/JwtFilterIntegrationTest.java | 5 ++-
15 files changed, 108 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 364d019..f2572a6 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -34,6 +34,10 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java
index 29bd55d..092d739 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentIdTest.java
@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.UUID;
-import org.apache.commons.io.IOUtils;
+import org.apache.james.util.ClassLoaderUtils;
import org.junit.Test;
public class AttachmentIdTest {
@@ -127,8 +127,8 @@ public class AttachmentIdTest {
@Test
public void forPayloadAndTypeShouldCalculateDifferentHashesWhenCraftedSha1Collision() throws Exception {
- byte[] payload1 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-1.pdf"));
- byte[] payload2 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-2.pdf"));
+ byte[] payload1 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-1.pdf");
+ byte[] payload2 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-2.pdf");
AttachmentId attachmentId1 = AttachmentId.forPayloadAndType(payload1, "application/pdf");
AttachmentId attachmentId2 = AttachmentId.forPayloadAndType(payload2, "application/pdf");
assertThat(attachmentId1).isNotEqualTo(attachmentId2);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java
index 808871b..e8e3f13 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/BlobIdTest.java
@@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.io.IOUtils;
+import org.apache.james.util.ClassLoaderUtils;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -84,8 +84,8 @@ public class BlobIdTest {
@Test
public void forPayloadShouldCalculateDifferentHashesWhenCraftedSha1Collision() throws Exception {
- byte[] payload1 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-1.pdf"));
- byte[] payload2 = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("shattered-2.pdf"));
+ byte[] payload1 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-1.pdf");
+ byte[] payload2 = ClassLoaderUtils.getSystemResourceAsByteArray("shattered-2.pdf");
BlobId blobId1 = BlobId.forPayload(payload1);
BlobId blobId2 = BlobId.forPayload(payload2);
assertThat(blobId1).isNotEqualTo(blobId2);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
index 5fbb373..052d0a2 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
@@ -30,7 +30,6 @@ import java.time.ZoneId;
import javax.mail.Flags;
-import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.elasticsearch.IndexAttachments;
import org.apache.james.mailbox.extractor.ParsedContent;
@@ -263,7 +262,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -298,7 +297,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -328,7 +327,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -359,7 +358,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -390,7 +389,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/mailWithHeaders.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -419,7 +418,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -448,7 +447,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/emailWith3Attachments.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -484,7 +483,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(InMemoryMessageId.of(42));
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -517,7 +516,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(invalidMessageIdThatReturnNull);
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
@@ -546,7 +545,7 @@ public class IndexableMessageTest {
when(mailboxMessage.getMessageId())
.thenReturn(null);
when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml"))));
+ .thenReturn(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml"));
when(mailboxMessage.createFlags())
.thenReturn(new Flags());
when(mailboxMessage.getUid())
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
index 3193211..6e8e979 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
@@ -51,6 +51,7 @@ import org.apache.james.mailbox.tika.TikaConfiguration;
import org.apache.james.mailbox.tika.TikaContainer;
import org.apache.james.mailbox.tika.TikaHttpClientImpl;
import org.apache.james.mailbox.tika.TikaTextExtractor;
+import org.apache.james.util.ClassLoaderUtils;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
@@ -120,7 +121,7 @@ public class MessageToElasticSearchJsonTest {
date,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/spamMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/spamMail.eml")),
new Flags(),
propertyBuilder,
MAILBOX_ID);
@@ -140,7 +141,7 @@ public class MessageToElasticSearchJsonTest {
date,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/htmlMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/htmlMail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("social", "pocket-money").build(),
propertyBuilder,
MAILBOX_ID);
@@ -160,7 +161,7 @@ public class MessageToElasticSearchJsonTest {
date,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/pgpSignedMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/pgpSignedMail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
MAILBOX_ID);
@@ -180,7 +181,7 @@ public class MessageToElasticSearchJsonTest {
date,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/mail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/mail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
MAILBOX_ID);
@@ -201,7 +202,7 @@ public class MessageToElasticSearchJsonTest {
date,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
MAILBOX_ID);
@@ -221,7 +222,7 @@ public class MessageToElasticSearchJsonTest {
null,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
MAILBOX_ID);
@@ -240,7 +241,7 @@ public class MessageToElasticSearchJsonTest {
null,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
MAILBOX_ID);
@@ -268,7 +269,7 @@ public class MessageToElasticSearchJsonTest {
null,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
MAILBOX_ID);
@@ -299,7 +300,7 @@ public class MessageToElasticSearchJsonTest {
mailWithNoMailboxId = new SimpleMailboxMessage(MESSAGE_ID, date,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/recursiveMail.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/recursiveMail.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
null);
@@ -349,7 +350,7 @@ public class MessageToElasticSearchJsonTest {
MailboxMessage spamMail = new SimpleMailboxMessage(MESSAGE_ID, date,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/nonTextual.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/nonTextual.eml")),
new Flags(),
propertyBuilder,
MAILBOX_ID);
@@ -367,7 +368,7 @@ public class MessageToElasticSearchJsonTest {
null,
SIZE,
BODY_START_OCTET,
- new SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/emailWithNonIndexableAttachment.eml"))),
+ new SharedByteArrayInputStream(ClassLoaderUtils.getSystemResourceAsByteArray("eml/emailWithNonIndexableAttachment.eml")),
new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("debian", "security").build(),
propertyBuilder,
MAILBOX_ID);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
index e6e8790..2bbecde 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
@@ -31,7 +31,6 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageIdManager;
@@ -56,6 +55,7 @@ import org.apache.james.mime4j.message.BodyPart;
import org.apache.james.mime4j.message.BodyPartBuilder;
import org.apache.james.mime4j.message.DefaultMessageWriter;
import org.apache.james.mime4j.message.MultipartBuilder;
+import org.apache.james.util.ClassLoaderUtils;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -1180,7 +1180,7 @@ public abstract class AbstractMessageSearchIndexTest {
@Test
public void searchWithPDFAttachmentShouldReturnMailsWhenAttachmentContentMatches() throws Exception {
Assume.assumeTrue(storeMailboxManager.getSupportedSearchCapabilities().contains(MailboxManager.SearchCapabilities.Attachment));
- byte[] attachmentContent = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/attachment.pdf"));
+ byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
BodyPart attachment = BodyPartBuilder.create()
.setBody(attachmentContent, "application/pdf")
.setContentDisposition("attachment")
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
index 4397c68..d4c8b0e 100644
--- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
+++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
@@ -32,6 +32,7 @@ import java.util.stream.Collectors;
import javax.mail.MessagingException;
import org.apache.james.core.MailAddress;
+import org.apache.james.util.ClassLoaderUtils;
import org.apache.mailet.Mail;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.test.FakeMail;
@@ -44,7 +45,6 @@ import org.junit.rules.ExpectedException;
import com.fasterxml.jackson.core.io.JsonStringEncoder;
import com.google.common.collect.ImmutableMap;
-import com.google.common.io.ByteStreams;
import net.fortuna.ical4j.data.CalendarBuilder;
import net.fortuna.ical4j.model.Calendar;
@@ -198,7 +198,7 @@ public class ICALToJsonAttributeTest {
public void serviceShouldFilterMailsWithoutSender() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar);
Mail mail = FakeMail.builder()
@@ -216,7 +216,7 @@ public class ICALToJsonAttributeTest {
public void serviceShouldAttachEmptyListWhenNoRecipient() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar);
ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics);
@@ -236,7 +236,7 @@ public class ICALToJsonAttributeTest {
public void serviceShouldAttachJson() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar);
ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics);
@@ -273,7 +273,7 @@ public class ICALToJsonAttributeTest {
public void serviceShouldAttachJsonForSeveralRecipient() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar);
ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics);
@@ -316,8 +316,8 @@ public class ICALToJsonAttributeTest {
public void serviceShouldAttachJsonForSeveralICALs() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
- byte[] ics2 = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_2.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
+ byte[] ics2 = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_2.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
Calendar calendar2 = new CalendarBuilder().build(new ByteArrayInputStream(ics2));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar, "key2", calendar2);
@@ -362,8 +362,8 @@ public class ICALToJsonAttributeTest {
public void serviceShouldFilterInvalidICS() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
- byte[] ics2 = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_uid.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
+ byte[] ics2 = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_uid.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
Calendar calendar2 = new CalendarBuilder().build(new ByteArrayInputStream(ics2));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar, "key2", calendar2);
@@ -398,8 +398,8 @@ public class ICALToJsonAttributeTest {
public void serviceShouldFilterNonExistingKeys() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
- byte[] ics2 = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_2.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
+ byte[] ics2 = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_2.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
Calendar calendar2 = new CalendarBuilder().build(new ByteArrayInputStream(ics2));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar, "key2", calendar2);
@@ -434,7 +434,7 @@ public class ICALToJsonAttributeTest {
public void serviceShouldUseFromWhenSpecified() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar);
ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics);
@@ -470,7 +470,7 @@ public class ICALToJsonAttributeTest {
public void serviceShouldSupportMimeMessagesWithoutFromFields() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar);
ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics);
@@ -504,7 +504,7 @@ public class ICALToJsonAttributeTest {
public void serviceShouldUseFromWhenSpecifiedAndNoSender() throws Exception {
testee.init(FakeMailetConfig.builder().build());
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ImmutableMap<String, Calendar> icals = ImmutableMap.of("key", calendar);
ImmutableMap<String, byte[]> rawIcals = ImmutableMap.of("key", ics);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
index 1d4dffe..a61fba9 100644
--- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
+++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
@@ -25,7 +25,7 @@ import java.util.Map;
import javax.mail.MessagingException;
-import org.apache.commons.io.IOUtils;
+import org.apache.james.util.ClassLoaderUtils;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailetConfig;
@@ -235,7 +235,7 @@ public class ICalendarParserTest {
mailet.init(mailetConfiguration);
Map<String, byte[]> attachments = ImmutableMap.<String, byte[]>builder()
- .put("key", IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("ics/ics_with_error.ics")))
+ .put("key", ClassLoaderUtils.getSystemResourceAsByteArray("ics/ics_with_error.ics"))
.build();
Mail mail = FakeMail.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java
index 4699ae3..878aa72 100644
--- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java
+++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java
@@ -24,13 +24,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
import org.apache.james.core.MailAddress;
+import org.apache.james.util.ClassLoaderUtils;
import org.apache.mailet.base.MailAddressFixture;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import com.google.common.io.ByteStreams;
-
import net.fortuna.ical4j.data.CalendarBuilder;
import net.fortuna.ical4j.model.Calendar;
import nl.jqno.equalsverifier.EqualsVerifier;
@@ -54,7 +53,7 @@ public class ICALTest {
public void buildShouldFailWhenNoSender() throws Exception {
expectedException.expect(NullPointerException.class);
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ICAL.builder()
@@ -67,7 +66,7 @@ public class ICALTest {
public void buildShouldFailWhenNoRecipient() throws Exception {
expectedException.expect(NullPointerException.class);
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
ICAL.builder()
@@ -79,7 +78,7 @@ public class ICALTest {
@Test
public void buildShouldWork() throws Exception {
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
MailAddress recipient = MailAddressFixture.ANY_AT_JAMES;
@@ -109,7 +108,7 @@ public class ICALTest {
@Test
public void buildShouldThrowOnCalendarWithoutDtstamp() throws Exception {
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_dtstamp.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_dtstamp.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
expectedException.expect(IllegalStateException.class);
@@ -125,7 +124,7 @@ public class ICALTest {
@Test
public void buildShouldThrowOnCalendarWithoutUid() throws Exception {
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_uid.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_uid.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
expectedException.expect(IllegalStateException.class);
@@ -141,7 +140,7 @@ public class ICALTest {
@Test
public void buildShouldThrowOnCalendarWithoutMethod() throws Exception {
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_method.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_method.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
expectedException.expect(IllegalStateException.class);
@@ -157,7 +156,7 @@ public class ICALTest {
@Test
public void buildShouldSetDefaultValueWhenCalendarWithoutSequence() throws Exception {
- byte[] ics = ByteStreams.toByteArray(ClassLoader.getSystemResourceAsStream("ics/meeting_without_sequence.ics"));
+ byte[] ics = ClassLoaderUtils.getSystemResourceAsByteArray("ics/meeting_without_sequence.ics");
Calendar calendar = new CalendarBuilder().build(new ByteArrayInputStream(ics));
MailAddress recipient = MailAddressFixture.ANY_AT_JAMES;
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java b/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java
new file mode 100644
index 0000000..d7df10a
--- /dev/null
+++ b/server/container/util-java8/src/main/java/org/apache/james/util/ClassLoaderUtils.java
@@ -0,0 +1,35 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.util;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+
+public class ClassLoaderUtils {
+ public static String getSystemResourceAsString(String filename) throws IOException {
+ return IOUtils.toString(ClassLoader.getSystemResourceAsStream(filename), StandardCharsets.US_ASCII);
+ }
+
+ public static byte[] getSystemResourceAsByteArray(String filename) throws IOException {
+ return IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream(filename));
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/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 9e2bb06..148ba17 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
@@ -25,10 +25,8 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
-import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
-import org.apache.commons.io.IOUtils;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -39,6 +37,7 @@ import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.SMIMEDecrypt;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
+import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -104,7 +103,7 @@ public class SMIMEDecryptIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
.authenticate(FROM, PASSWORD)
.sendMessageWithHeaders(FROM, FROM,
- IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII))
+ ClassLoaderUtils.getSystemResourceAsString("eml/crypted.eml"))
.awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -119,7 +118,7 @@ public class SMIMEDecryptIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
.authenticate(FROM, PASSWORD)
.sendMessageWithHeaders(FROM, FROM,
- IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII))
+ ClassLoaderUtils.getSystemResourceAsString("eml/crypted_with_attachment.eml"))
.awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -135,7 +134,7 @@ public class SMIMEDecryptIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
.authenticate(FROM, PASSWORD)
.sendMessageWithHeaders(FROM, FROM,
- IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII))
+ ClassLoaderUtils.getSystemResourceAsString("eml/bad_crypted.eml"))
.awaitSent(awaitOneMinute);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index 7b8a0e7..52b33de 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -39,7 +39,6 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.commons.io.IOUtils;
import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
import org.apache.james.jmap.HttpJmapAuthentication;
@@ -62,6 +61,7 @@ import org.apache.james.mime4j.message.MultipartBuilder;
import org.apache.james.modules.ACLProbeImpl;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
+import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.util.date.ImapDateTimeFormatter;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.JmapGuiceProbe;
@@ -1007,7 +1007,7 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldFilterMessagesWhenAttachmentFilterDoesntMatches() throws Exception {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- byte[] attachmentContent = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/attachment.pdf"));
+ byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
BodyPart attachment = BodyPartBuilder.create()
.setBody(attachmentContent, "application/pdf")
.setContentDisposition("attachment")
@@ -1040,7 +1040,7 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldNotFilterMessagesWhenAttachmentFilterMatches() throws Exception {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- byte[] attachmentContent = IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/attachment.pdf"));
+ byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
BodyPart attachment = BodyPartBuilder.create()
.setBody(attachmentContent, "application/pdf")
.setContentDisposition("attachment")
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index b2e3bfd..adc161f 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -77,6 +77,7 @@ import org.apache.james.mailbox.store.probe.MailboxProbe;
import org.apache.james.modules.ACLProbeImpl;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
+import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.util.ZeroedInputStream;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -4589,7 +4590,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldCreateMessageWhenSendingMessageWithNonIndexableAttachment() throws Exception {
Attachment nonIndexableAttachment = Attachment.builder()
- .bytes(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("attachment/nonIndexableAttachment.html")))
+ .bytes(ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html"))
.type("text/html")
.build();
uploadTextAttachment(nonIndexableAttachment);
@@ -4641,7 +4642,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void messageWithNonIndexableAttachmentShouldBeRetrievedWhenChainingSetMessagesAndGetMessages() throws Exception {
Attachment nonIndexableAttachment = Attachment.builder()
- .bytes(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("attachment/nonIndexableAttachment.html")))
+ .bytes(ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html"))
.type("text/html")
.build();
uploadTextAttachment(nonIndexableAttachment);
@@ -4701,7 +4702,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void messageWithNonIndexableAttachmentShouldHaveItsEmailBodyIndexed() throws Exception {
Attachment nonIndexableAttachment = Attachment.builder()
- .bytes(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("attachment/nonIndexableAttachment.html")))
+ .bytes(ClassLoaderUtils.getSystemResourceAsByteArray("attachment/nonIndexableAttachment.html"))
.type("text/html")
.build();
uploadTextAttachment(nonIndexableAttachment);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
index 66d02e1..2ae24b8 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
@@ -28,7 +28,6 @@ import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.Optional;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.james.jmap.model.MessageFactory.MetaDataWithContent;
import org.apache.james.jmap.utils.HtmlTextExtractor;
@@ -360,7 +359,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(0)
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("spamMail.eml"))))
+ .content(ClassLoader.getSystemResourceAsStream("spamMail.eml"))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -386,7 +385,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(0)
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("spamMail.eml"))))
+ .content(ClassLoader.getSystemResourceAsStream("spamMail.eml"))
.attachments(ImmutableList.of(MessageAttachment.builder()
.attachment(org.apache.james.mailbox.model.Attachment.builder()
.attachmentId(AttachmentId.from(blodId.getRawValue()))
http://git-wip-us.apache.org/repos/asf/james-project/blob/d6fade96/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
index c8dca1c..4ba097c 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
@@ -28,11 +28,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
-import org.apache.commons.io.IOUtils;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
import org.apache.james.jwt.JwtConfiguration;
+import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.WebAdminGuiceProbe;
import org.apache.james.webadmin.authentication.AuthenticationFilter;
@@ -78,8 +78,7 @@ public class JwtFilterIntegrationTest {
@Before
public void setUp() throws Exception {
JwtConfiguration jwtConfiguration = new JwtConfiguration(
- Optional.of(
- IOUtils.toString(ClassLoader.getSystemResourceAsStream("jwt_publickey"), StandardCharsets.UTF_8)));
+ Optional.of(ClassLoaderUtils.getSystemResourceAsString("jwt_publickey")));
guiceJamesServer = cassandraJmapTestRule.jmapServer(cassandra.getModule())
.overrideWith(new WebAdminConfigurationModule(),
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[04/44] james-project git commit: JAMES-2267 MimeMessageBuilder
improvment: rely on Throwing rather than manual Preconditions.propagate
Posted by bt...@apache.org.
JAMES-2267 MimeMessageBuilder improvment: rely on Throwing rather than manual Preconditions.propagate
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c53a7b92
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c53a7b92
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c53a7b92
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: c53a7b9236d5a638a00b2cf4b9b2d230f7ff69eb
Parents: b860c64
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 10:20:02 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:50 2018 +0700
----------------------------------------------------------------------
.../apache/mailet/base/test/MimeMessageBuilder.java | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c53a7b92/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
index b2b0794..31ef6f1 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
@@ -28,7 +28,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
-import java.util.function.Function;
import javax.activation.DataHandler;
import javax.mail.BodyPart;
@@ -48,7 +47,6 @@ import org.apache.commons.io.IOUtils;
import com.github.fge.lambdas.Throwing;
import com.github.steveash.guavate.Guavate;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
public class MimeMessageBuilder {
@@ -189,14 +187,6 @@ public class MimeMessageBuilder {
}
}
- public static final Function<String, InternetAddress> TO_INTERNET_ADDRESS = value -> {
- try {
- return new InternetAddress(value);
- } catch (AddressException e) {
- throw Throwables.propagate(e);
- }
- };
-
public static MimeMessage defaultMimeMessage() {
return new MimeMessage(Session.getDefaultInstance(new Properties()));
}
@@ -284,21 +274,21 @@ public class MimeMessageBuilder {
public MimeMessageBuilder addToRecipient(String... tos) throws AddressException {
this.to.addAll(Arrays.stream(tos)
- .map(TO_INTERNET_ADDRESS)
+ .map(Throwing.function(InternetAddress::new))
.collect(Guavate.toImmutableList()));
return this;
}
public MimeMessageBuilder addCcRecipient(String... ccs) throws AddressException {
this.cc.addAll(Arrays.stream(ccs)
- .map(TO_INTERNET_ADDRESS)
+ .map(Throwing.function(InternetAddress::new))
.collect(Guavate.toImmutableList()));
return this;
}
public MimeMessageBuilder addBccRecipient(String... bccs) throws AddressException {
this.bcc.addAll(Arrays.stream(bccs)
- .map(TO_INTERNET_ADDRESS)
+ .map(Throwing.function(InternetAddress::new))
.collect(Guavate.toImmutableList()));
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[25/44] james-project git commit: JAMES-2267 MessageSender should be
a test rule
Posted by bt...@apache.org.
JAMES-2267 MessageSender should be a test rule
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2da49b99
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2da49b99
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2da49b99
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 2da49b99e3fe38c878ac4c6d2bcf0a17a6d2bb41
Parents: 9e639ad
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 16:21:13 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 40 ++--
.../james/mailets/BounceIntegrationTest.java | 107 +++++------
.../mailets/CommonMailetConfigurationTest.java | 32 ++--
.../GatewayRemoteDeliveryIntegrationTest.java | 92 +++++----
.../RecipientRewriteTableIntegrationTest.java | 103 +++++-----
.../org/apache/james/mailets/SieveDelivery.java | 33 ++--
.../james/mailets/SmtpAuthIntegrationTest.java | 48 +++--
.../james/mailets/configuration/Constants.java | 2 +
.../crypto/SMIMEDecryptIntegrationTest.java | 70 ++++---
.../james/smtp/SmtpAuthorizedAddressesTest.java | 53 +++---
.../james/smtp/SmtpBracketEnforcementTest.java | 42 ++---
.../smtp/SmtpIdentityVerificationTest.java | 31 ++-
.../james/smtp/SmtpSizeLimitationTest.java | 20 +-
.../mailets/AmqpForwardAttachmentTest.java | 17 +-
.../transport/mailets/ContactExtractorTest.java | 31 +--
.../mailets/ICSAttachmentWorkflowTest.java | 187 +++++++++----------
.../transport/mailets/StripAttachmentTest.java | 19 +-
.../apache/james/utils/SMTPMessageSender.java | 34 +++-
18 files changed, 462 insertions(+), 499 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index bd47efb..36f95da 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -21,15 +21,15 @@ package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.AddDeliveredToHeader;
import org.apache.james.utils.DataProbeImpl;
@@ -46,12 +46,18 @@ public class AddDeliveredToHeaderTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
+
+ DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
+ dataProbe.addUser(RECIPIENT, PASSWORD);
}
@After
@@ -61,27 +67,15 @@ public class AddDeliveredToHeaderTest {
@Test
public void receivedMessagesShouldContainDeliveredToHeaders() throws Exception {
- String from = "user@" + DEFAULT_DOMAIN;
- String recipient = "user2@" + DEFAULT_DOMAIN;
-
- DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(from, PASSWORD);
- dataProbe.addUser(recipient, PASSWORD);
-
- jamesServer.getProbe(MailboxProbeImpl.class)
- .createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX");
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(from, recipient)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(recipient, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessageHeaders())
- .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + recipient);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessageHeaders())
+ .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + RECIPIENT);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index b23082f..6d8c1cf 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
@@ -24,6 +24,7 @@ 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.RECIPIENT;
import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
@@ -55,12 +56,13 @@ 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;
- private static final String RECIPIENT = "to@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
private DataProbe dataProbe;
@@ -80,20 +82,19 @@ public class BounceIntegrationTest {
.mailet(DSNBounce.class)
.addProperty("passThrough", "false")))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(BOUNCE_RECEIVER, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -106,20 +107,19 @@ public class BounceIntegrationTest {
.mailet(Bounce.class)
.addProperty("passThrough", "false")))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(BOUNCE_RECEIVER, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -132,20 +132,19 @@ public class BounceIntegrationTest {
.addProperty("forwardTo", BOUNCE_RECEIVER)
.addProperty("passThrough", "false")))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(BOUNCE_RECEIVER, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -159,20 +158,19 @@ public class BounceIntegrationTest {
.addProperty("recipients", BOUNCE_RECEIVER)
.addProperty("passThrough", "false")))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(BOUNCE_RECEIVER, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -186,20 +184,19 @@ public class BounceIntegrationTest {
.addProperty("recipients", BOUNCE_RECEIVER)
.addProperty("passThrough", "false")))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(BOUNCE_RECEIVER, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -212,20 +209,19 @@ public class BounceIntegrationTest {
.mailet(NotifySender.class)
.addProperty("passThrough", "false")))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(BOUNCE_RECEIVER, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -244,14 +240,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(POSTMASTER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(POSTMASTER, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(POSTMASTER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
private MailetContainer generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 2b61ade..7f13bc8 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -21,14 +21,14 @@ package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -44,12 +44,17 @@ public class CommonMailetConfigurationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
+ DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
+ dataProbe.addUser(RECIPIENT, PASSWORD);
}
@After
@@ -63,22 +68,13 @@ public class CommonMailetConfigurationTest {
@Test
public void simpleMailShouldBeSent() throws Exception {
- DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(DEFAULT_DOMAIN);
- String from = "user@" + DEFAULT_DOMAIN;
- dataProbe.addUser(from, PASSWORD);
- String recipient = "user2@" + DEFAULT_DOMAIN;
- dataProbe.addUser(recipient, PASSWORD);
- jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX");
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(from, recipient)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(recipient, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 75dc866..34a44e4 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -78,6 +78,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private final TemporaryFolder smtpFolder = new TemporaryFolder();
private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
@@ -119,16 +121,15 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
- }
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -139,16 +140,15 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
- }
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -159,16 +159,15 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
- }
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -184,11 +183,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
- }
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -208,16 +206,15 @@ public class GatewayRemoteDeliveryIntegrationTest {
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- Thread.sleep(TimeUnit.SECONDS.toMillis(5));
- when()
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("", hasSize(0));
- }
+ Thread.sleep(TimeUnit.SECONDS.toMillis(5));
+ when()
+ .get("/api/email")
+ .then()
+ .statusCode(200)
+ .body("", hasSize(0));
}
@Test
public void remoteDeliveryShouldBounceUponFailure() throws Exception {
@@ -236,19 +233,18 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
.addProcessor(CommonProcessors.bounces()))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -285,19 +281,18 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProperty("gateway", gatewayProperty)))
.addProcessor(CommonProcessors.bounces()))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -316,16 +311,15 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProcessor(directResolutionTransport())
.addProcessor(CommonProcessors.bounces()))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT);
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
- }
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
private boolean messageIsReceivedByTheSmtpServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index decf799..ea0773e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -54,6 +54,8 @@ public class RecipientRewriteTableIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
private DataProbe dataProbe;
@@ -76,32 +78,29 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void rrtServiceShouldDeliverEmailToMappingRecipients() throws Exception {
dataProbe.addUser(FROM, PASSWORD);
-
createUserInbox(ANY_AT_JAMES);
createUserInbox(OTHER_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(ANY_AT_JAMES, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(OTHER_AT_JAMES, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(ANY_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(OTHER_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
public void rrtServiceShouldNotDeliverEmailToRecipientWhenHaveMappingRecipients() throws Exception {
dataProbe.addUser(FROM, PASSWORD);
-
createUserInbox(RECIPIENT);
createUserInbox(ANY_AT_JAMES);
createUserInbox(OTHER_AT_JAMES);
@@ -109,79 +108,71 @@ public class RecipientRewriteTableIntegrationTest {
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
}
@Test
public void rrtServiceShouldDeliverEmailToRecipientOnLocalWhenMappingContainsNonDomain() throws Exception {
String nonDomainUser = "nondomain";
String localUser = nonDomainUser + "@" + dataProbe.getDefaultDomain();
-
dataProbe.addUser(FROM, PASSWORD);
-
createUserInbox(localUser);
createUserInbox(OTHER_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, nonDomainUser);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(localUser, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(OTHER_AT_JAMES, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(localUser, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(OTHER_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
public void messageShouldRedirectToTheSameUserWhenDomainMapping() throws Exception {
dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
-
createUserInbox(ANY_AT_JAMES);
createUserInbox(ANY_AT_ANOTHER_DOMAIN);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, ANY_AT_JAMES)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, ANY_AT_JAMES)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(ANY_AT_ANOTHER_DOMAIN, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(ANY_AT_ANOTHER_DOMAIN, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
public void messageShouldNotSendToRecipientWhenDomainMapping() throws Exception {
dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
-
createUserInbox(ANY_AT_JAMES);
createUserInbox(ANY_AT_ANOTHER_DOMAIN);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, ANY_AT_JAMES)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, ANY_AT_JAMES)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(ANY_AT_JAMES, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(ANY_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
}
private void createUserInbox(String username) throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 3d5fc03..7a2d064 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,9 +21,11 @@ package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
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.calmlyAwait;
@@ -46,29 +48,25 @@ public class SieveDelivery {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
private String targetedMailbox;
- private String recipient;
- private String from;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
-
- from = "user@" + DEFAULT_DOMAIN;
- recipient = "user2@" + DEFAULT_DOMAIN;
targetedMailbox = "INBOX.any";
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(from, PASSWORD);
- dataProbe.addUser(recipient, PASSWORD);
+ dataProbe.addUser(FROM, PASSWORD);
+ dataProbe.addUser(RECIPIENT, PASSWORD);
MailboxProbe mailboxProbe = jamesServer.getProbe(MailboxProbeImpl.class);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX");
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipient, targetedMailbox);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, targetedMailbox);
}
@After
@@ -78,18 +76,17 @@ public class SieveDelivery {
@Test
public void simpleMailShouldBeSent() throws Exception {
- jamesServer.getProbe(SieveProbeImpl.class).addActiveSieveScript(recipient, "myscript.sieve", "require \"fileinto\";\n" +
+ jamesServer.getProbe(SieveProbeImpl.class).addActiveSieveScript(RECIPIENT, "myscript.sieve", "require \"fileinto\";\n" +
"\n" +
"fileinto \"" + targetedMailbox + "\";");
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);) {
- messageSender.sendMessage(from, recipient)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(recipient, PASSWORD)
- .select(targetedMailbox)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(targetedMailbox)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 68385ae..624edae 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
@@ -57,8 +57,11 @@ public class SmtpAuthIntegrationTest {
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
+ private MailRepositoryProbeImpl repositoryProbe;
@Before
public void setup() throws Exception {
@@ -85,6 +88,7 @@ public class SmtpAuthIntegrationTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
+ repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
@@ -117,36 +121,30 @@ public class SmtpAuthIntegrationTest {
@Test
public void authenticatedSmtpSessionsShouldBeDelivered() throws Exception {
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ }
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ @Test
+ public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception {
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ assertThat(
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(FROM, PASSWORD)
.select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
- }
-
- @Test
- public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception {
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
- assertThat(
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .hasAMessage())
- .isFalse();
- }
+ .hasAMessage())
+ .isFalse();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 0d2bd72..7c16fbb 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
@@ -37,4 +37,6 @@ public class Constants {
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/2da49b99/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 16e9ccc..d02e901 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
@@ -62,6 +62,8 @@ public class SMIMEDecryptIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -105,53 +107,49 @@ public class SMIMEDecryptIntegrationTest {
@Test
public void cryptedMessageShouldBeDecryptedWhenCertificateMatches() throws Exception {
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
-
- messageSender.sendMessageWithHeaders(FROM, FROM,
+ messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage()).containsSequence("Crypted content");
- }
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).containsSequence("Crypted content");
}
@Test
public void cryptedMessageWithAttachmentShouldBeDecryptedWhenCertificateMatches() throws Exception {
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
- messageSender.sendMessageWithHeaders(FROM, FROM,
+ messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage())
- .containsSequence("Crypted Content with attachment");
- }
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage())
+ .containsSequence("Crypted Content with attachment");
}
@Test
public void cryptedMessageShouldNotBeDecryptedWhenCertificateDoesntMatch() throws Exception {
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
- messageSender.sendMessageWithHeaders(FROM, FROM,
+ messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII))
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage())
- .containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE");
- }
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage())
+ .containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 489ee06..2bc721b 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
@@ -78,6 +78,8 @@ public class SmtpAuthorizedAddressesTest {
public RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp);
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -153,15 +155,12 @@ public class SmtpAuthorizedAddressesTest {
.requireAuthentication()
.withAutorizedAddresses("127.0.0.0/8"));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
-
- messageSender.sendMessage(FROM, TO)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, TO)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(this::messageIsReceivedByTheSmtpServer);
- }
+ calmlyAwait.atMost(ONE_MINUTE)
+ .until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -170,12 +169,10 @@ public class SmtpAuthorizedAddressesTest {
.requireAuthentication()
.withAutorizedAddresses("172.0.0.0/8"));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, TO);
- messageSender.sendMessage(FROM, TO);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
- }
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
}
@Test
@@ -184,15 +181,12 @@ public class SmtpAuthorizedAddressesTest {
.requireAuthentication()
.withAutorizedAddresses("172.0.0.0/8"));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, TO)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- messageSender.sendMessage(FROM, TO)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- calmlyAwait.atMost(ONE_MINUTE)
- .until(this::messageIsReceivedByTheSmtpServer);
- }
+ calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
}
@Test
@@ -201,17 +195,14 @@ public class SmtpAuthorizedAddressesTest {
.requireAuthentication()
.withAutorizedAddresses("172.0.0.0/8"));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(TO, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- messageSender.sendMessage(TO, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
private boolean messageIsReceivedByTheSmtpServer() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 0dc6295..14f9505 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
@@ -50,6 +50,8 @@ public class SmtpBracketEnforcementTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -97,12 +99,10 @@ public class SmtpBracketEnforcementTest {
createJamesServer(SmtpConfiguration.builder()
.doNotRequireBracketEnforcement());
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
-
- messageSender.sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(USER, PASSWORD)
+ .sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -110,12 +110,10 @@ public class SmtpBracketEnforcementTest {
createJamesServer(SmtpConfiguration.builder()
.doNotRequireBracketEnforcement());
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
-
- messageSender.sendMessageNoBracket(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(USER, PASSWORD)
+ .sendMessageNoBracket(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -123,12 +121,10 @@ public class SmtpBracketEnforcementTest {
createJamesServer(SmtpConfiguration.builder()
.requireBracketEnforcement());
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
-
- messageSender.sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(USER, PASSWORD)
+ .sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -136,11 +132,9 @@ public class SmtpBracketEnforcementTest {
createJamesServer(SmtpConfiguration.builder()
.requireBracketEnforcement());
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
-
- messageSender.sendMessageNoBracket(USER, USER);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(USER, PASSWORD)
+ .sendMessageNoBracket(USER, USER);
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 f56a476..1217df5 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
@@ -53,6 +53,8 @@ public class SmtpIdentityVerificationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -98,12 +100,9 @@ public class SmtpIdentityVerificationTest {
.requireAuthentication()
.verifyIdentity());
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
-
- messageSender.sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(USER, PASSWORD).sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -112,12 +111,10 @@ public class SmtpIdentityVerificationTest {
.requireAuthentication()
.doNotVerifyIdentity());
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, ATTACKER, ATTACKER_PASSWORD)) {
-
- messageSender.sendMessage(USER, USER)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(ATTACKER, ATTACKER_PASSWORD)
+ .sendMessage(USER, USER)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -126,12 +123,10 @@ public class SmtpIdentityVerificationTest {
.requireAuthentication()
.verifyIdentity());
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, ATTACKER, ATTACKER_PASSWORD)) {
-
- messageSender.sendMessage(USER, USER);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(ATTACKER, ATTACKER_PASSWORD)
+ .sendMessage(USER, USER);
+ calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 0716d4e..f2bb893 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
@@ -52,6 +52,8 @@ public class SmtpSizeLimitationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -100,12 +102,10 @@ public class SmtpSizeLimitationTest {
.doNotVerifyIdentity()
.withMaxMessageSizeInKb(10));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
-
- messageSender.sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(USER, PASSWORD)
+ .sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024));
calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
- }
}
@Test
@@ -114,11 +114,9 @@ public class SmtpSizeLimitationTest {
.doNotVerifyIdentity()
.withMaxMessageSizeInKb(10));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
-
- messageSender.sendMessageWithHeaders(USER, USER,"Short message")
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(USER, PASSWORD)
+ .sendMessageWithHeaders(USER, USER,"Short message")
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 34ff43d..550dd1d 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
@@ -78,6 +78,8 @@ public class AmqpForwardAttachmentTest {
public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -144,15 +146,14 @@ public class AmqpForwardAttachmentTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 52379cd..55d779d 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
@@ -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.SMTP_PORT;
import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
-import static org.apache.mailet.base.MailAddressFixture.JAMES_APACHE_ORG;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
@@ -75,6 +74,8 @@ public class ContactExtractorTest {
public RuleChain chain = RuleChain.outerRule(rabbit).around(amqpRule).around(folder);
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -136,22 +137,22 @@ public class ContactExtractorTest {
.sender(new MailAddress(SENDER))
.recipients(new MailAddress(TO), new MailAddress(TO2), new MailAddress(CC), new MailAddress(CC2), new MailAddress(BCC), new MailAddress(BCC2))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(SENDER, PASSWORD)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(TO, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(TO, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- Optional<String> actual = amqpRule.readContent();
- assertThat(actual).isNotEmpty();
- assertThatJson(actual.get()).isEqualTo("{"
- + "\"userEmail\" : \"sender@james.org\", "
- + "\"emails\" : [ \"to@james.org\", \"John To2 <to...@james.org>\", \"cc@james.org\", \"John Cc2 <cc...@james.org>\", \"bcc@james.org\", \"John Bcc2 <bc...@james.org>\" ]"
- + "}");
- }
+ Optional<String> actual = amqpRule.readContent();
+ assertThat(actual).isNotEmpty();
+ assertThatJson(actual.get()).isEqualTo("{"
+ + "\"userEmail\" : \"sender@james.org\", "
+ + "\"emails\" : [ \"to@james.org\", \"John To2 <to...@james.org>\", \"cc@james.org\", \"John Cc2 <cc...@james.org>\", \"bcc@james.org\", \"John Bcc2 <bc...@james.org>\" ]"
+ + "}");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 fddaca5..c70df91 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -440,6 +440,8 @@ public class ICSAttachmentWorkflowTest {
public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
private MimeMessage messageWithoutICSAttached;
@@ -592,15 +594,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
Optional<String> content = amqpRule.readContent();
assertThat(content).isPresent();
@@ -629,22 +630,21 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
-
- assertThat(receivedHeaders).doesNotContain("X-MEETING-UID");
- assertThat(receivedHeaders).doesNotContain("X-MEETING-METHOD");
- assertThat(receivedHeaders).doesNotContain("X-MEETING-RECURRENCE-ID");
- assertThat(receivedHeaders).doesNotContain("X-MEETING-SEQUENCE");
- assertThat(receivedHeaders).doesNotContain("X-MEETING-DTSTAMP");
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
+ assertThat(receivedHeaders).doesNotContain("X-MEETING-UID");
+ assertThat(receivedHeaders).doesNotContain("X-MEETING-METHOD");
+ assertThat(receivedHeaders).doesNotContain("X-MEETING-RECURRENCE-ID");
+ assertThat(receivedHeaders).doesNotContain("X-MEETING-SEQUENCE");
+ assertThat(receivedHeaders).doesNotContain("X-MEETING-DTSTAMP");
}
@Test
@@ -655,21 +655,20 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
- assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
- assertThat(receivedHeaders).contains("X-MEETING-SEQUENCE: " + ICS_SEQUENCE);
- assertThat(receivedHeaders).contains("X-MEETING-DTSTAMP: " + ICS_DTSTAMP);
- }
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
+ assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
+ assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
+ assertThat(receivedHeaders).contains("X-MEETING-SEQUENCE: " + ICS_SEQUENCE);
+ assertThat(receivedHeaders).contains("X-MEETING-DTSTAMP: " + ICS_DTSTAMP);
}
@Test
@@ -680,21 +679,20 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_BASE64_UID);
- assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
- assertThat(receivedHeaders).contains("X-MEETING-SEQUENCE: " + ICS_SEQUENCE);
- assertThat(receivedHeaders).contains("X-MEETING-DTSTAMP: " + ICS_BASE64_DTSTAMP);
- }
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
+ assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_BASE64_UID);
+ assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
+ assertThat(receivedHeaders).contains("X-MEETING-SEQUENCE: " + ICS_SEQUENCE);
+ assertThat(receivedHeaders).contains("X-MEETING-DTSTAMP: " + ICS_BASE64_DTSTAMP);
}
@Test
@@ -705,15 +703,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
Optional<String> content = amqpRule.readContent();
assertThat(content).isPresent();
@@ -735,15 +732,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
Optional<String> content = amqpRule.readContent();
assertThat(content).isPresent();
@@ -766,21 +762,20 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
- assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
- assertThat(receivedHeaders).contains("X-MEETING-SEQUENCE: " + ICS_SEQUENCE);
- assertThat(receivedHeaders).contains("X-MEETING-DTSTAMP: " + ICS_DTSTAMP);
- }
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
+ assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
+ assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
+ assertThat(receivedHeaders).contains("X-MEETING-SEQUENCE: " + ICS_SEQUENCE);
+ assertThat(receivedHeaders).contains("X-MEETING-DTSTAMP: " + ICS_DTSTAMP);
}
@Test
@@ -791,15 +786,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
Optional<String> content1 = amqpRule.readContent();
assertThat(content1).isPresent();
@@ -833,16 +827,15 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage())
- .containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment");
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage())
+ .containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da49b99/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 7849834..c79d02a 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
@@ -62,6 +62,8 @@ public class StripAttachmentTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -136,15 +138,14 @@ public class StripAttachmentTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage()).contains("Matching attachment");
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains("Matching attachment");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[03/44] james-project git commit: JAMES-2267 Mailet integration
testing: implicit build calling for Mailet configuration
Posted by bt...@apache.org.
JAMES-2267 Mailet integration testing: implicit build calling for Mailet configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3e6b0574
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3e6b0574
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3e6b0574
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 3e6b0574cf6726207e82466e3e7666fa94dac3f7
Parents: c53a7b9
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 10:52:39 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:50 2018 +0700
----------------------------------------------------------------------
.../james/smtp/SmtpAuthorizedAddressesTest.java | 17 ++++-------
.../james/smtp/SmtpBracketEnforcementTest.java | 14 +++------
.../smtp/SmtpIdentityVerificationTest.java | 11 ++-----
.../james/smtp/SmtpSizeLimitationTest.java | 14 +++------
.../mailets/AmqpForwardAttachmentTest.java | 19 ++++--------
.../transport/mailets/ContactExtractorTest.java | 16 ++++------
.../transport/mailets/GroupMappingTest.java | 29 ++++++------------
.../mailets/ICSAttachmentWorkflowTest.java | 31 +++++++-------------
.../transport/mailets/StripAttachmentTest.java | 19 ++++--------
9 files changed, 52 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 3222dac..052df4d 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
@@ -116,9 +116,7 @@ public class SmtpAuthorizedAddressesTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
- .build())
+ .addProperty("processor", "transport")))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
@@ -126,12 +124,10 @@ public class SmtpAuthorizedAddressesTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(SMTPIsAuthNetwork.class)
.mailet(RemoteDelivery.class)
@@ -142,14 +138,11 @@ public class SmtpAuthorizedAddressesTest {
.addProperty("deliveryThreads", "10")
.addProperty("sendpartial", "true")
.addProperty("bounceProcessor", "bounces")
- .addProperty("gateway", fakeSmtp.getContainerIp())
- .build())
+ .addProperty("gateway", fakeSmtp.getContainerIp()))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")
- .build())
- .build())
+ .addProperty("processor", "bounces")))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 3480a8e..4507903 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
@@ -79,9 +79,7 @@ public class SmtpBracketEnforcementTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
- .build())
+ .addProperty("processor", "transport")))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
@@ -89,18 +87,14 @@ public class SmtpBracketEnforcementTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")
- .build())
- .build())
+ .addProperty("processor", "bounces")))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 114d902..61ebd81 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
@@ -81,9 +81,7 @@ public class SmtpIdentityVerificationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
- .build())
+ .addProperty("processor", "transport")))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
@@ -91,13 +89,10 @@ public class SmtpIdentityVerificationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
+ .mailet(LocalDelivery.class)))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 5da56b6..c477575 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
@@ -80,9 +80,7 @@ public class SmtpSizeLimitationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
- .build())
+ .addProperty("processor", "transport")))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.builder()
.state("transport")
@@ -90,18 +88,14 @@ public class SmtpSizeLimitationTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "bounces")
- .build())
- .build())
+ .addProperty("processor", "bounces")))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 a91ee69..15d5daf 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
@@ -98,36 +98,29 @@ public class AmqpForwardAttachmentTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
.addProperty(StripAttachment.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
- .addProperty(StripAttachment.PATTERN_PARAMETER_NAME, ".*\\.txt")
- .build())
+ .addProperty(StripAttachment.PATTERN_PARAMETER_NAME, ".*\\.txt"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(MimeDecodingMailet.class)
- .addProperty(MimeDecodingMailet.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
- .build())
+ .addProperty(MimeDecodingMailet.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(AmqpForwardAttribute.class)
.addProperty(AmqpForwardAttribute.URI_PARAMETER_NAME, amqpRule.getAmqpUri())
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE_NAME)
.addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
- .addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY)
- .build())
+ .addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
+ .mailet(LocalDelivery.class)))
.build();
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 d258675..c348e06 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
@@ -89,29 +89,23 @@ public class ContactExtractorTest {
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ContactExtractor.class)
- .addProperty(ContactExtractor.Configuration.ATTRIBUTE, attribute)
- .build())
+ .addProperty(ContactExtractor.Configuration.ATTRIBUTE, attribute))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(AmqpForwardAttribute.class)
.addProperty(AmqpForwardAttribute.URI_PARAMETER_NAME, amqpRule.getAmqpUri())
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE)
- .addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, attribute)
- .build())
+ .addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, attribute))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
+ .mailet(LocalDelivery.class)))
.build();
jamesServer = TemporaryJamesServer.builder().build(folder, mailets);
DataProbeImpl probe = jamesServer.getProbe(DataProbeImpl.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 db5fe68..8f78d83 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
@@ -115,44 +115,35 @@ public class GroupMappingTest {
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(PostmasterAlias.class)
- .build())
+ .mailet(PostmasterAlias.class))
.addMailet(MailetConfiguration.builder()
.matcher(RelayLimit.class)
.matcherCondition("30")
- .mailet(Null.class)
- .build())
+ .mailet(Null.class))
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
+ .addProperty("processor", "transport"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "transport")
- .build())
- .build())
+ .addProperty("processor", "transport")))
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(RecipientRewriteTable.class)
- .build())
+ .mailet(RecipientRewriteTable.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
@@ -162,9 +153,7 @@ public class GroupMappingTest {
.addProperty("maxDnsProblemRetries", "0")
.addProperty("deliveryThreads", "10")
.addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
- .build())
- .build())
+ .addProperty("bounceProcessor", "bounces")))
.build();
jamesServer = TemporaryJamesServer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 217a721..00d7051 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
@@ -464,58 +464,47 @@ public class ICSAttachmentWorkflowTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
.addProperty("attribute", MAIL_ATTRIBUTE)
- .addProperty("pattern", ".*")
- .build())
+ .addProperty("pattern", ".*"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(MimeDecodingMailet.class)
- .addProperty("attribute", MAIL_ATTRIBUTE)
- .build())
+ .addProperty("attribute", MAIL_ATTRIBUTE))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ICalendarParser.class)
.addProperty("sourceAttribute", MAIL_ATTRIBUTE)
- .addProperty("destinationAttribute", PARSED_ICAL_MAIL_ATTRIBUTE)
- .build())
+ .addProperty("destinationAttribute", PARSED_ICAL_MAIL_ATTRIBUTE))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ICALToHeader.class)
- .addProperty("attribute", PARSED_ICAL_MAIL_ATTRIBUTE)
- .build())
+ .addProperty("attribute", PARSED_ICAL_MAIL_ATTRIBUTE))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ICALToJsonAttribute.class)
.addProperty("source", PARSED_ICAL_MAIL_ATTRIBUTE)
.addProperty("rawSource", MAIL_ATTRIBUTE)
- .addProperty("destination", JSON_MAIL_ATTRIBUTE)
- .build())
+ .addProperty("destination", JSON_MAIL_ATTRIBUTE))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(TextCalendarBodyToAttachment.class)
- .build())
+ .mailet(TextCalendarBodyToAttachment.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(AmqpForwardAttribute.class)
.addProperty("uri", amqpRule.getAmqpUri())
.addProperty("exchange", EXCHANGE_NAME)
.addProperty("attribute", JSON_MAIL_ATTRIBUTE)
- .addProperty("routing_key", ROUTING_KEY)
- .build())
+ .addProperty("routing_key", ROUTING_KEY))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
+ .mailet(LocalDelivery.class)))
.build();
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e6b0574/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 8ad3299..76f2a0a 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
@@ -82,33 +82,26 @@ public class StripAttachmentTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
.addProperty("attribute", "my.attribute")
.addProperty("remove", "all")
- .addProperty("notpattern", ".*.tmp.*")
- .build())
+ .addProperty("notpattern", ".*.tmp.*"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(OnlyText.class)
- .build())
+ .mailet(OnlyText.class))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RecoverAttachment.class)
- .addProperty("attribute", "my.attribute")
- .build())
+ .addProperty("attribute", "my.attribute"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
+ .mailet(LocalDelivery.class)))
.build();
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[37/44] james-project git commit: JAMES-2267 Simplify and factorize
RemoteDelivery configuration
Posted by bt...@apache.org.
JAMES-2267 Simplify and factorize RemoteDelivery configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/21e13266
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/21e13266
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/21e13266
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 21e132665d496a085320624db2d6544a2e7a55cb
Parents: c6532c8
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 11:27:30 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:38 2018 +0700
----------------------------------------------------------------------
.../james/mailets/BounceIntegrationTest.java | 15 ++--
.../GatewayRemoteDeliveryIntegrationTest.java | 81 ++++----------------
.../james/mailets/SmtpAuthIntegrationTest.java | 5 +-
.../configuration/MailetConfiguration.java | 17 ++++
.../james/smtp/SmtpAuthorizedAddressesTest.java | 11 +--
.../transport/mailets/GroupMappingTest.java | 10 +--
6 files changed, 40 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/21e13266/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 1e686a7..e5a3cc2 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
@@ -247,17 +247,16 @@ public class BounceIntegrationTest {
.awaitMessage(awaitOneMinute);
}
- private MailetContainer generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
+ private MailetContainer.Builder generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
return MailetContainer.builder()
.postmaster(POSTMASTER)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(transport())
- .addProcessor(bounces(redirectionMailetConfiguration))
- .build();
+ .addProcessor(bounces(redirectionMailetConfiguration));
}
- private ProcessorConfiguration transport() {
+ private ProcessorConfiguration.Builder transport() {
// This processor delivers emails to BOUNCE_RECEIVER and POSTMASTER
// Other recipients will be bouncing
return ProcessorConfiguration.transport()
@@ -270,13 +269,11 @@ public class BounceIntegrationTest {
.matcher(RecipientIs.class)
.matcherCondition(POSTMASTER)
.mailet(LocalDelivery.class))
- .addMailet(MailetConfiguration.TO_BOUNCE)
- .build();
+ .addMailet(MailetConfiguration.TO_BOUNCE);
}
- public static ProcessorConfiguration bounces(MailetConfiguration.Builder redirectionMailetConfiguration) {
+ public static ProcessorConfiguration.Builder bounces(MailetConfiguration.Builder redirectionMailetConfiguration) {
return ProcessorConfiguration.bounces()
- .addMailet(redirectionMailetConfiguration)
- .build();
+ .addMailet(redirectionMailetConfiguration);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/21e13266/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 55900f0..b4586d1 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -40,10 +40,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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
-import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
@@ -211,12 +208,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
- .addProcessor(CommonProcessors.simpleRoot())
- .addProcessor(CommonProcessors.error())
- .addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
- .addProcessor(CommonProcessors.bounces()))
+ .withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
@@ -240,21 +232,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
- .addMailet(MailetConfiguration.builder()
+ .addMailet(MailetConfiguration.remoteDeliveryBuilderNoBounces()
.matcher(All.class)
- .mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
- .addProperty("delayTime", "5000, 100000, 500000")
- .addProperty("maxRetries", "2")
- .addProperty("maxDnsProblemRetries", "0")
- .addProperty("deliveryThreads", "2")
- .addProperty("sendpartial", "true")
.addProperty("gateway", gatewayProperty)))
.addProcessor(CommonProcessors.bounces()))
.build(temporaryFolder);
@@ -278,7 +262,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(directResolutionTransport())
@@ -302,67 +285,29 @@ public class GatewayRemoteDeliveryIntegrationTest {
.body("[0].subject", equalTo("test")));
}
- private MailetContainer generateMailetContainerConfiguration(String gatewayProperty) {
+ private MailetContainer.Builder generateMailetContainerConfiguration(String gatewayProperty) {
return MailetContainer.builder()
- .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
- .addProcessor(relayOnlyTransport(gatewayProperty))
- .addProcessor(CommonProcessors.bounces())
- .build();
+ .addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
+ .addProcessor(CommonProcessors.bounces());
}
- private ProcessorConfiguration relayOnlyTransport(String gatewayProperty) {
+ private ProcessorConfiguration.Builder relayAndLocalDeliveryTransport(String gatewayProperty) {
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
- .addProperty("delayTime", "5000, 100000, 500000")
- .addProperty("maxRetries", "2")
- .addProperty("maxDnsProblemRetries", "0")
- .addProperty("deliveryThreads", "2")
- .addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
- .addProperty("gateway", gatewayProperty))
- .build();
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
+ .addMailet(MailetConfiguration.remoteDeliveryBuilder()
+ .addProperty("gateway", gatewayProperty)
+ .matcher(All.class));
}
- private ProcessorConfiguration relayAndLocalDeliveryTransport(String gatewayProperty) {
+ private ProcessorConfiguration.Builder directResolutionTransport() {
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
- .addProperty("delayTime", "5000, 100000, 500000")
- .addProperty("maxRetries", "2")
- .addProperty("maxDnsProblemRetries", "0")
- .addProperty("deliveryThreads", "2")
- .addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
- .addProperty("gateway", gatewayProperty))
- .build();
+ .addMailet(MailetConfiguration.remoteDeliveryBuilder()
+ .matcher(All.class));
}
- private ProcessorConfiguration directResolutionTransport() {
- return ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
- .addProperty("delayTime", "5000, 100000, 500000")
- .addProperty("maxRetries", "2")
- .addProperty("maxDnsProblemRetries", "0")
- .addProperty("deliveryThreads", "2")
- .addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces"))
- .build();
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/21e13266/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 61faf23..2a57982 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
@@ -89,13 +89,12 @@ public class SmtpAuthIntegrationTest {
repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
}
- private ProcessorConfiguration bounces() {
+ private ProcessorConfiguration.Builder bounces() {
return ProcessorConfiguration.bounces()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
- .addProperty("repositoryPath", DROPPED_MAILS))
- .build();
+ .addProperty("repositoryPath", DROPPED_MAILS));
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/21e13266/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
index 17c27d7..b7619c3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Optional;
import org.apache.james.transport.mailets.LocalDelivery;
+import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
@@ -103,6 +104,22 @@ public class MailetConfiguration implements SerializableAsXml {
.addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)
.build();
+ public static MailetConfiguration.Builder remoteDeliveryBuilder() {
+ return remoteDeliveryBuilderNoBounces()
+ .addProperty("bounceProcessor", ProcessorConfiguration.STATE_BOUNCES);
+ }
+
+ public static MailetConfiguration.Builder remoteDeliveryBuilderNoBounces() {
+ return MailetConfiguration.builder()
+ .mailet(RemoteDelivery.class)
+ .addProperty("outgoingQueue", "outgoing")
+ .addProperty("delayTime", "5000, 100000, 500000")
+ .addProperty("maxRetries", "2")
+ .addProperty("maxDnsProblemRetries", "0")
+ .addProperty("deliveryThreads", "2")
+ .addProperty("sendpartial", "true");
+ }
+
private final Class<? extends Matcher> matcher;
private final Optional<String> matcherCondition;
private final Class<? extends Mailet> mailet;
http://git-wip-us.apache.org/repos/asf/james-project/blob/21e13266/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 14f5f4f..4fa53a4 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
@@ -36,7 +36,6 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.transport.matchers.SMTPIsAuthNetwork;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
@@ -90,16 +89,8 @@ public class SmtpAuthorizedAddressesTest {
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
- .addMailet(MailetConfiguration.builder()
+ .addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(SMTPIsAuthNetwork.class)
- .mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
- .addProperty("delayTime", "5000, 100000, 500000")
- .addProperty("maxRetries", "25")
- .addProperty("maxDnsProblemRetries", "0")
- .addProperty("deliveryThreads", "10")
- .addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", ProcessorConfiguration.STATE_BOUNCES)
.addProperty("gateway", fakeSmtp.getContainerIp()))
.addMailet(MailetConfiguration.TO_BOUNCE))
.addProcessor(CommonProcessors.localAddressError())
http://git-wip-us.apache.org/repos/asf/james-project/blob/21e13266/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 5f51620..6ae78d3 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
@@ -108,16 +108,8 @@ public class GroupMappingTest {
.matcher(RecipientIsLocal.class)
.mailet(VacationMailet.class))
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
- .addMailet(MailetConfiguration.builder()
+ .addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(All.class)
- .mailet(RemoteDelivery.class)
- .addProperty("outgoingQueue", "outgoing")
- .addProperty("delayTime", "5000, 100000, 500000")
- .addProperty("maxRetries", "25")
- .addProperty("maxDnsProblemRetries", "0")
- .addProperty("deliveryThreads", "10")
- .addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
.addProperty("gateway", fakeSmtp.getContainerIp())))
.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[31/44] james-project git commit: JAMES-2267 Introduce LocalDelivery
as a common mailet
Posted by bt...@apache.org.
JAMES-2267 Introduce LocalDelivery as a common mailet
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0b7685ae
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0b7685ae
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0b7685ae
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 0b7685aea44a173d5e67815cfd3b5247da892821
Parents: 95a3266
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 10:40:31 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
.../james/mailets/GatewayRemoteDeliveryIntegrationTest.java | 4 +---
.../apache/james/mailets/NetworkMatcherIntegrationTest.java | 5 +----
.../org/apache/james/mailets/SmtpAuthIntegrationTest.java | 5 +----
.../james/mailets/configuration/MailetConfiguration.java | 7 +++++++
.../james/mailets/crypto/SMIMEDecryptIntegrationTest.java | 6 +-----
.../apache/james/mailets/crypto/SMIMESignIntegrationTest.java | 6 +-----
.../org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 6 +-----
.../org/apache/james/smtp/SmtpBracketEnforcementTest.java | 6 +-----
.../org/apache/james/smtp/SmtpIdentityVerificationTest.java | 6 +-----
.../java/org/apache/james/smtp/SmtpSizeLimitationTest.java | 6 +-----
.../james/transport/mailets/AmqpForwardAttachmentTest.java | 5 +----
.../apache/james/transport/mailets/ContactExtractorTest.java | 5 +----
.../org/apache/james/transport/mailets/GroupMappingTest.java | 4 +---
.../james/transport/mailets/ICSAttachmentWorkflowTest.java | 5 +----
.../apache/james/transport/mailets/StripAttachmentTest.java | 5 +----
15 files changed, 21 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index bb95936..7bfc074 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -251,9 +251,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 40d5197..da7c3d8 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -33,7 +33,6 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.mailets.ToRepository;
import org.apache.james.transport.matchers.All;
@@ -79,9 +78,7 @@ public class NetworkMatcherIntegrationTest {
private ProcessorConfiguration deliverOnlyTransport() {
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(LocalDelivery.class))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 64b5d93..a3b7eae 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
@@ -33,7 +33,6 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.mailets.ToRepository;
import org.apache.james.transport.matchers.All;
@@ -97,9 +96,7 @@ public class SmtpAuthIntegrationTest {
private ProcessorConfiguration deliverOnlyTransport() {
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(LocalDelivery.class))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
index ead2e08..9241aa4 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
@@ -23,8 +23,10 @@ package org.apache.james.mailets.configuration;
import java.util.Map;
import java.util.Optional;
+import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.matchers.All;
+import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
@@ -83,6 +85,11 @@ public class MailetConfiguration implements SerializableAsXml {
.addProperty("name", "bcc")
.build();
+ public static final MailetConfiguration LOCAL_DELIVERY = MailetConfiguration.builder()
+ .matcher(RecipientIsLocal.class)
+ .mailet(LocalDelivery.class)
+ .build();
+
private final Class<? extends Matcher> matcher;
private final Optional<String> matcherCondition;
private final Class<? extends Mailet> mailet;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 148ba17..2d2275d 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
@@ -33,10 +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.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.SMIMEDecrypt;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.apache.james.utils.DataProbeImpl;
@@ -77,9 +75,7 @@ public class SMIMEDecryptIntegrationTest {
.addProperty("keyStorePassword", "secret")
.addProperty("keyStoreType", "PKCS12")
.addProperty("debug", "true"))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY))
.build();
jamesServer = TemporaryJamesServer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 4d6ec0b..ebf46f8 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
@@ -35,11 +35,9 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.SMIMESign;
import org.apache.james.transport.mailets.SetMimeHeader;
import org.apache.james.transport.matchers.HasMailAttribute;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.SenderIsLocal;
import org.apache.james.util.date.ZonedDateTimeProvider;
import org.apache.james.utils.DataProbeImpl;
@@ -87,9 +85,7 @@ public class SMIMESignIntegrationTest {
.addProperty("keyStorePassword", "secret")
.addProperty("keyStoreType", "PKCS12")
.addProperty("debug", "true"))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY))
.addProcessor(CommonProcessors.spam())
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 571e3c3..0af382f 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
@@ -36,11 +36,9 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.SMTPIsAuthNetwork;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
@@ -97,9 +95,7 @@ public class SmtpAuthorizedAddressesTest {
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.builder()
.matcher(SMTPIsAuthNetwork.class)
.mailet(RemoteDelivery.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 468b078..30d2783 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
@@ -33,10 +33,8 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -64,9 +62,7 @@ public class SmtpBracketEnforcementTest {
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 cda3ad2..677d827 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
@@ -33,10 +33,8 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -67,9 +65,7 @@ public class SmtpIdentityVerificationTest {
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 a7df9d2..657cdc3 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
@@ -33,10 +33,8 @@ 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.probe.DataProbe;
-import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
@@ -66,9 +64,7 @@ public class SmtpSizeLimitationTest {
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 18e8c0e..2d4dd3f 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
@@ -38,7 +38,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
@@ -101,9 +100,7 @@ public class AmqpForwardAttachmentTest {
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE_NAME)
.addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
.addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY))
.build();
jamesServer = TemporaryJamesServer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 822a7ce..335b3cd 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
@@ -37,7 +37,6 @@ import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.SMTPAuthSuccessful;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
@@ -97,9 +96,7 @@ public class ContactExtractorTest {
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE)
.addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, attribute))
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY))
.build();
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 7e1d3ee..bb9880f 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
@@ -125,9 +125,7 @@ public class GroupMappingTest {
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 3532f4b..c035991 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
@@ -42,7 +42,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
@@ -486,9 +485,7 @@ public class ICSAttachmentWorkflowTest {
.addProperty("exchange", EXCHANGE_NAME)
.addProperty("attribute", JSON_MAIL_ATTRIBUTE)
.addProperty("routing_key", ROUTING_KEY))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY))
.build();
jamesServer = TemporaryJamesServer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 4929ca8..03d45b4 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
@@ -37,7 +37,6 @@ import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
@@ -82,9 +81,7 @@ public class StripAttachmentTest {
.matcher(All.class)
.mailet(RecoverAttachment.class)
.addProperty("attribute", "my.attribute"))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY))
.build();
jamesServer = TemporaryJamesServer.builder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[23/44] james-project git commit: JAMES-2267 Make FakeMail builder a
bit more fluent
Posted by bt...@apache.org.
JAMES-2267 Make FakeMail builder a bit more fluent
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ca7051aa
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ca7051aa
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ca7051aa
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: ca7051aa9c3a97d2d6db9c8e5bbc499dca4cfe91
Parents: 2da49b9
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 17:43:52 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../AutomaticallySentMailDetectorImplTest.java | 35 ++--
.../org/apache/mailet/base/test/FakeMail.java | 16 ++
.../mailet/base/test/FakeMailContext.java | 10 ++
.../transport/mailets/ContactExtractorTest.java | 43 +++--
.../james/transport/mailets/LogMessageTest.java | 5 +-
.../mailets/RecipientToLowerCaseTest.java | 2 +-
.../transport/matchers/HasMimeTypeTest.java | 13 +-
.../transport/matchers/SenderIsNullTest.java | 3 +-
.../transport/matchers/SenderIsRegexTest.java | 6 +-
.../james/transport/matchers/SenderIsTest.java | 4 +-
.../matchers/TooManyRecipientsTest.java | 9 +-
.../mailets/AmqpForwardAttachmentTest.java | 13 +-
.../transport/mailets/ContactExtractorTest.java | 11 +-
.../transport/mailets/GroupMappingTest.java | 168 +++++++------------
.../mailets/ICSAttachmentWorkflowTest.java | 126 ++++++--------
.../transport/mailets/StripAttachmentTest.java | 13 +-
.../james/transport/mailets/DSNBounceTest.java | 26 +--
.../mailets/delivery/LocalDeliveryTest.java | 2 +-
.../mailets/delivery/SieveIntegrationTest.java | 12 +-
.../mailets/delivery/ToRecipientFolderTest.java | 2 +-
.../managesieve/ManageSieveMailetTestCase.java | 4 +-
.../matchers/InSpammerBlacklistTest.java | 4 +-
.../integration/SetMessagesMethodTest.java | 5 +-
.../james/jmap/mailet/VacationMailetTest.java | 4 +-
server/testing/pom.xml | 5 +
.../apache/james/utils/SMTPMessageSender.java | 5 +
26 files changed, 239 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
index c99ff14..6e2c135 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java
@@ -32,7 +32,6 @@ import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.util.ByteArrayDataSource;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.Test;
@@ -62,7 +61,7 @@ public class AutomaticallySentMailDetectorImplTest {
@Test
public void ownerIsAMailingListPrefix() throws Exception {
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("owner-list@any.com"))
+ .sender("owner-list@any.com")
.build();
assertThat(new AutomaticallySentMailDetectorImpl().isMailingList(fakeMail)).isTrue();
@@ -71,7 +70,7 @@ public class AutomaticallySentMailDetectorImplTest {
@Test
public void requestIsAMailingListPrefix() throws Exception {
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("list-request@any.com"))
+ .sender("list-request@any.com")
.build();
assertThat(new AutomaticallySentMailDetectorImpl().isMailingList(fakeMail)).isTrue();
@@ -80,7 +79,7 @@ public class AutomaticallySentMailDetectorImplTest {
@Test
public void mailerDaemonIsReserved() throws Exception {
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("MAILER-DAEMON@any.com"))
+ .sender("MAILER-DAEMON@any.com")
.build();
assertThat(new AutomaticallySentMailDetectorImpl().isMailingList(fakeMail)).isTrue();
@@ -89,7 +88,7 @@ public class AutomaticallySentMailDetectorImplTest {
@Test
public void listservIsReserved() throws Exception {
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("LISTSERV@any.com"))
+ .sender("LISTSERV@any.com")
.build();
assertThat(new AutomaticallySentMailDetectorImpl().isMailingList(fakeMail)).isTrue();
@@ -98,7 +97,7 @@ public class AutomaticallySentMailDetectorImplTest {
@Test
public void majordomoIsReserved() throws Exception {
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("majordomo@any.com"))
+ .sender("majordomo@any.com")
.build();
assertThat(new AutomaticallySentMailDetectorImpl().isMailingList(fakeMail)).isTrue();
@@ -109,7 +108,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("List-Id", "any");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -121,7 +120,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("List-Help", "any");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -133,7 +132,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("List-Subscribe", "any");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -145,7 +144,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("List-Unsubscribe", "any");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -157,7 +156,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("List-Post", "any");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -169,7 +168,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("List-Owner", "any");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -181,7 +180,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("List-Archive", "any");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -191,7 +190,7 @@ public class AutomaticallySentMailDetectorImplTest {
@Test
public void normalMailShouldNotBeIdentifiedAsMailingList() throws Exception {
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(new MimeMessage(Session.getDefaultInstance(new Properties())))
.build();
@@ -212,7 +211,7 @@ public class AutomaticallySentMailDetectorImplTest {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()));
message.setHeader("Auto-Submitted", "auto-replied");
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -235,7 +234,7 @@ public class AutomaticallySentMailDetectorImplTest {
message.setContent(multipart);
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -258,7 +257,7 @@ public class AutomaticallySentMailDetectorImplTest {
message.setContent(multipart);
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
@@ -281,7 +280,7 @@ public class AutomaticallySentMailDetectorImplTest {
message.setContent(multipart);
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress("any@any.com"))
+ .sender("any@any.com")
.mimeMessage(message)
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index beee826..90acb0d 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -23,6 +23,7 @@ package org.apache.mailet.base.test;
import java.io.ByteArrayInputStream;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
@@ -33,6 +34,7 @@ import java.util.Properties;
import javax.mail.MessagingException;
import javax.mail.Session;
+import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
@@ -41,6 +43,7 @@ import org.apache.mailet.Mail;
import org.apache.mailet.PerRecipientHeaders;
import org.apache.mailet.PerRecipientHeaders.Header;
+import com.github.fge.lambdas.Throwing;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -148,11 +151,20 @@ public class FakeMail implements Mail {
return this;
}
+ public Builder recipients(String... recipients) {
+ Arrays.stream(recipients).forEach(Throwing.consumer(this::recipient));
+ return this;
+ }
+
public Builder recipient(MailAddress recipient) {
this.recipients.add(recipient);
return this;
}
+ public Builder recipient(String recipient) throws AddressException {
+ return recipient(new MailAddress(recipient));
+ }
+
public Builder name(String name) {
this.name = Optional.of(name);
return this;
@@ -163,6 +175,10 @@ public class FakeMail implements Mail {
return this;
}
+ public Builder sender(String sender) throws AddressException {
+ return sender(new MailAddress(sender));
+ }
+
public Builder state(String state) {
this.state = Optional.of(state);
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
index 9489dbe..f7d279b 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
@@ -31,6 +31,7 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
import javax.mail.internet.MimeMessage;
import org.apache.james.core.MailAddress;
@@ -120,6 +121,10 @@ public class FakeMailContext implements MailetContext {
return this;
}
+ public Builder sender(String sender) throws AddressException {
+ return sender(new MailAddress(sender));
+ }
+
public Builder recipients(Collection<MailAddress> recipients) {
this.recipients = Optional.of(recipients);
return this;
@@ -140,6 +145,11 @@ public class FakeMailContext implements MailetContext {
return recipients(ImmutableList.of(recipient));
}
+ public Builder recipient(String recipient) throws AddressException {
+ Preconditions.checkNotNull(recipient);
+ return recipients(new MailAddress(recipient));
+ }
+
public Builder message(MimeMessage mimeMessage) {
this.msg = mimeMessage;
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
index 99b04f4..c6f1c41 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.MailetContext;
import org.apache.mailet.MailetException;
import org.apache.mailet.base.test.FakeMail;
@@ -87,8 +86,8 @@ public class ContactExtractorTest {
@Test
public void serviceShouldNotThrowWhenJsonProcessingFails() throws Exception {
FakeMail mail = FakeMail.builder().mimeMessage(MimeMessageBuilder.defaultMimeMessage())
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(TO))
+ .sender(SENDER)
+ .recipient(TO)
.build();
ObjectMapper objectMapper = mock(ObjectMapper.class);
@@ -109,8 +108,8 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(TO))
+ .sender(SENDER)
+ .recipient(TO)
.build();
mailet.init(mailetConfig);
@@ -128,8 +127,8 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(TO))
+ .sender(SENDER)
+ .recipient(TO)
.build();
mailet.init(mailetConfig);
@@ -147,8 +146,8 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(TO))
+ .sender(SENDER)
+ .recipient(TO)
.build();
mailet.init(mailetConfig);
@@ -167,8 +166,8 @@ public class ContactExtractorTest {
+ "Please!";
MimeMessage message = MimeMessageBuilder.mimeMessageFromBytes(rawMessage.getBytes());
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress("frecipient@example.com"))
+ .sender(SENDER)
+ .recipient("recipient@example.com")
.build();
mailet.init(mailetConfig);
@@ -187,8 +186,8 @@ public class ContactExtractorTest {
+ "Please!";
MimeMessage message = MimeMessageBuilder.mimeMessageFromBytes(rawMessage.getBytes());
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress("frecipient@example.com"))
+ .sender(SENDER)
+ .recipient("recipient@example.com")
.build();
mailet.init(mailetConfig);
@@ -207,8 +206,8 @@ public class ContactExtractorTest {
+ "Please!";
MimeMessage message = MimeMessageBuilder.mimeMessageFromBytes(rawMessage.getBytes());
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress("frecipient@example.com"))
+ .sender(SENDER)
+ .recipient("recipient@example.com")
.build();
mailet.init(mailetConfig);
@@ -226,8 +225,8 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(TO))
+ .sender(SENDER)
+ .recipient(TO)
.build();
mailet.init(mailetConfig);
@@ -245,8 +244,8 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(TO))
+ .sender(SENDER)
+ .recipient(TO)
.build();
mailet.init(mailetConfig);
@@ -263,7 +262,7 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .recipient(new MailAddress(TO))
+ .recipient(TO)
.build();
mailet.init(mailetConfig);
@@ -279,7 +278,7 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
+ .sender(SENDER)
.build();
mailet.init(mailetConfig);
@@ -295,7 +294,7 @@ public class ContactExtractorTest {
.setSubject("Contact collection Rocks")
.setText("This is my email");
FakeMail mail = FakeMail.builder().mimeMessage(message)
- .sender(new MailAddress(SENDER))
+ .sender(SENDER)
.build();
mailet.extractContacts(mail);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java
index 41dc494..14b08da 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java
@@ -38,7 +38,6 @@ import javax.mail.internet.AddressException;
import javax.mail.internet.MimeMessage;
import org.apache.mailet.Mail;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMailetConfig;
@@ -262,8 +261,8 @@ public class LogMessageTest {
.mimeMessage(message)
.name("name")
.state(Mail.DEFAULT)
- .recipient(new MailAddress("receiver@domain.com"))
- .sender(new MailAddress("sender@any.com"))
+ .recipient("receiver@domain.com")
+ .sender("sender@any.com")
.build();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java
index ed1d4b7..49762c6 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java
@@ -40,7 +40,7 @@ public class RecipientToLowerCaseTest {
@Test
public void serviceShouldPutRecipientToLowerCase() throws Exception {
FakeMail fakeMail = FakeMail.builder()
- .recipient(new MailAddress("THienan1234@gmail.com"))
+ .recipient("THienan1234@gmail.com")
.build();
testee.service(fakeMail);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
index f6ab324..97aa9cc 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMimeTypeTest.java
@@ -21,7 +21,6 @@ package org.apache.james.transport.matchers;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMatcherConfig;
@@ -66,8 +65,8 @@ public class HasMimeTypeTest {
Mail mail = FakeMail.builder()
.mimeMessage(message)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
+ .sender(FROM)
+ .recipient(RECIPIENT)
.build();
assertThat(matcher.match(mail)).containsAll(mail.getRecipients());
@@ -96,8 +95,8 @@ public class HasMimeTypeTest {
Mail mail = FakeMail.builder()
.mimeMessage(message)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
+ .sender(FROM)
+ .recipient(RECIPIENT)
.build();
assertThat(matcher.match(mail)).isEmpty();
@@ -116,8 +115,8 @@ public class HasMimeTypeTest {
Mail mail = FakeMail.builder()
.mimeMessage(message)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
+ .sender(FROM)
+ .recipient(RECIPIENT)
.build();
assertThat(matcher.match(mail)).containsExactlyElementsOf(mail.getRecipients());
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java
index 8241b64..1c2b429 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java
@@ -23,7 +23,6 @@ package org.apache.james.transport.matchers;
import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Before;
@@ -59,7 +58,7 @@ public class SenderIsNullTest {
public void shouldNotMatchWhenSenderIsPresent() throws Exception {
FakeMail fakeMail = FakeMail.builder()
.recipient(ANY_AT_JAMES)
- .sender(new MailAddress("other@james.apache.org"))
+ .sender("other@james.apache.org")
.build();
assertThat(matcher.match(fakeMail)).isNull();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
index 114dc26..f5668fb 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
@@ -55,7 +55,7 @@ public class SenderIsRegexTest {
.build());
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress(SENDER_NAME))
+ .sender(SENDER_NAME)
.recipient(recipient)
.build();
@@ -70,7 +70,7 @@ public class SenderIsRegexTest {
.build());
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress(SENDER_NAME))
+ .sender(SENDER_NAME)
.recipient(recipient)
.build();
@@ -99,7 +99,7 @@ public class SenderIsRegexTest {
.build());
FakeMail fakeMail = FakeMail.builder()
- .sender(new MailAddress(SENDER_NAME))
+ .sender(SENDER_NAME)
.recipient(recipient)
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
index 1c7b823..45f4242 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
@@ -57,7 +57,7 @@ public class SenderIsTest {
FakeMail fakeMail = FakeMail.builder()
.recipient(recipient)
- .sender(new MailAddress(SENDER_NAME))
+ .sender(SENDER_NAME)
.build();
assertThat(matcher.match(fakeMail)).containsExactly(recipient);
@@ -72,7 +72,7 @@ public class SenderIsTest {
FakeMail fakeMail = FakeMail.builder()
.recipient(recipient)
- .sender(new MailAddress("other@james.apache.org"))
+ .sender("other@james.apache.org")
.build();
assertThat(matcher.match(fakeMail)).isNull();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java
index 41ee23a..766d0dd 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java
@@ -116,7 +116,7 @@ public class TooManyRecipientsTest {
.build());
FakeMail fakeMail = FakeMail.builder()
- .recipient(new MailAddress("cuong.tran@gmail.com"))
+ .recipient("cuong.tran@gmail.com")
.build();
Collection<MailAddress> result = testee.match(fakeMail);
@@ -132,13 +132,8 @@ public class TooManyRecipientsTest {
.matcherName("matcherName")
.build());
- ImmutableList<MailAddress> mailAddresses = ImmutableList.of(
- new MailAddress("cuong.tran@gmail.com"),
- new MailAddress("suu.tran@gmail.com"),
- new MailAddress("tuan.tran@gmail.com"));
-
FakeMail fakeMail = FakeMail.builder()
- .recipients(mailAddresses)
+ .recipients("cuong.tran@gmail.com", "suu.tran@gmail.com", "tuan.tran@gmail.com")
.build();
Collection<MailAddress> result = testee.match(fakeMail);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/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 550dd1d..2db87c7 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
@@ -31,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.core.MailAddress;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -48,7 +47,6 @@ import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
-import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.After;
@@ -140,14 +138,11 @@ public class AmqpForwardAttachmentTest {
.filename("test.txt"))
.setSubject("test");
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/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 55d779d..bd4de44 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
@@ -31,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.core.MailAddress;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
import org.apache.james.mailets.configuration.MailetConfiguration;
@@ -132,14 +131,12 @@ public class ContactExtractorTest {
.addBccRecipient(BCC, "John Bcc2 <" + BCC2 + ">")
.setSubject("Contact collection Rocks")
.setText("This is my email");
- FakeMail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipients(new MailAddress(TO), new MailAddress(TO2), new MailAddress(CC), new MailAddress(CC2), new MailAddress(BCC), new MailAddress(BCC2))
- .build();
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.authenticate(SENDER, PASSWORD)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipients(TO, TO2, CC, CC2, BCC, BCC2))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/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 c4c5ae7..c672f85 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
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
import javax.mail.internet.MimeMessage;
-import org.apache.james.core.MailAddress;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.jmap.mailet.VacationMailet;
@@ -57,7 +56,6 @@ import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.apache.james.utils.WebAdminGuiceProbe;
import org.apache.james.webadmin.routes.GroupsRoutes;
-import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.After;
@@ -179,14 +177,11 @@ public class GroupMappingTest {
public void messageShouldRedirectToUserWhenBelongingToGroup() throws Exception {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -200,14 +195,11 @@ public class GroupMappingTest {
public void messageShouldRedirectToUserDoesNotHaveSameDomainWhenBelongingToGroup() throws Exception {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN2);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -223,17 +215,13 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN2);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(USER_DOMAIN1, PASSWORD)
.select(IMAPMessageReader.INBOX)
@@ -250,14 +238,11 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + GROUP_ON_DOMAIN2);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -275,14 +260,11 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + GROUP_ON_DOMAIN2);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -295,14 +277,11 @@ public class GroupMappingTest {
public void messageShouldNotBeDuplicatedWhenRecipientIsAlsoPartOfGroup() throws Exception {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipients(new MailAddress(GROUP_ON_DOMAIN1), new MailAddress(USER_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipients(GROUP_ON_DOMAIN1, USER_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -319,14 +298,11 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + GROUP_ON_DOMAIN2);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN2))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage( FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN2))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -350,14 +326,11 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN2 + "/" + GROUP_ON_DOMAIN1);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -377,14 +350,11 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -399,14 +369,11 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + USER_DOMAIN1);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -421,14 +388,11 @@ public class GroupMappingTest {
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN2 + "/" + USER_DOMAIN2);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient((GROUP_ON_DOMAIN1)))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -443,14 +407,11 @@ public class GroupMappingTest {
String groupWithEncodedSlash = "a%2Fa@" + DOMAIN1;
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + groupWithEncodedSlash + "/" + USER_DOMAIN1);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(groupWithSlash))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(groupWithSlash))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -466,14 +427,11 @@ public class GroupMappingTest {
String userWithEncodedSlash = "a%2Fa@" + DOMAIN1;
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + userWithEncodedSlash);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -488,14 +446,11 @@ public class GroupMappingTest {
String groupWithEncodedAt = "group%40" + DOMAIN1;
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + groupWithEncodedAt + "/" + userWithEncodedAt);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -509,14 +464,11 @@ public class GroupMappingTest {
String externalMail = "ray@yopmail.com";
restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + externalMail);
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(SENDER))
- .recipient(new MailAddress(GROUP_ON_DOMAIN1))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
calmlyAwait.atMost(1, TimeUnit.MINUTES)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/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 c70df91..76640b2 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
@@ -34,7 +34,6 @@ import java.util.Optional;
import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.core.MailAddress;
import org.apache.james.jmap.mailet.TextCalendarBodyToAttachment;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -52,7 +51,6 @@ import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
-import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.After;
@@ -567,35 +565,28 @@ public class ICSAttachmentWorkflowTest {
@Test
public void calendarAttachmentShouldNotBePublishedInMQWhenNoICalAttachment() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithoutICSAttached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithoutICSAttached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
assertThat(amqpRule.readContent()).isEmpty();
}
@Test
public void calendarAttachmentShouldBePublishedInMQWhenMatchingWorkflowConfiguration() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithICSAttached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithICSAttached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -624,14 +615,11 @@ public class ICSAttachmentWorkflowTest {
@Test
public void headersShouldNotBeAddedInMailWhenNoICalAttachment() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithoutICSAttached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithoutICSAttached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -649,14 +637,11 @@ public class ICSAttachmentWorkflowTest {
@Test
public void headersShouldBeAddedInMailWhenOneICalAttachment() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithICSAttached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithICSAttached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -673,14 +658,11 @@ public class ICSAttachmentWorkflowTest {
@Test
public void headersShouldBeAddedInMailWhenOneBase64ICalAttachment() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithICSBase64Attached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithICSBase64Attached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -697,14 +679,11 @@ public class ICSAttachmentWorkflowTest {
@Test
public void base64CalendarAttachmentShouldBePublishedInMQWhenMatchingWorkflowConfiguration() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithICSBase64Attached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithICSBase64Attached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -726,14 +705,11 @@ public class ICSAttachmentWorkflowTest {
@Test
public void yahooBase64CalendarAttachmentShouldBePublishedInMQWhenMatchingWorkflowConfiguration() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(yahooInvitationMessage)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(yahooInvitationMessage)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -756,14 +732,11 @@ public class ICSAttachmentWorkflowTest {
@Test
public void headersShouldBeFilledOnlyWithOneICalAttachmentWhenMailHasSeveral() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithThreeICSAttached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithThreeICSAttached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -780,14 +753,11 @@ public class ICSAttachmentWorkflowTest {
@Test
public void pipelineShouldSendSeveralJSONOverRabbitMQWhenSeveralAttachments() throws Exception {
- Mail mail = FakeMail.builder()
- .mimeMessage(messageWithThreeICSAttached)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(messageWithThreeICSAttached)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -821,14 +791,12 @@ public class ICSAttachmentWorkflowTest {
@Test
public void mailShouldNotContainCalendarContentInTextBodyButAttachment() throws Exception {
MimeMessage calendarMessage = MimeMessageBuilder.mimeMessageFromStream(ClassLoader.getSystemResourceAsStream("eml/calendar.eml"));
- Mail mail = FakeMail.builder()
- .mimeMessage(calendarMessage)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(calendarMessage)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/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 c79d02a..b902e9f 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
@@ -31,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.core.MailAddress;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -45,7 +44,6 @@ import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
-import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.After;
@@ -132,14 +130,11 @@ public class StripAttachmentTest {
.setSubject("test")
.build();
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(mail)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(FROM)
+ .recipient(RECIPIENT))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
index b46f490..b440830 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
@@ -34,10 +34,10 @@ import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
+import org.apache.james.core.MailAddress;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.transport.mailets.redirect.SpecialAddress;
import org.apache.mailet.Mail;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.base.DateFormats;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.RFC2822Headers;
@@ -128,7 +128,7 @@ public class DSNBounceTest {
.sender(senderMailAddress)
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
@@ -160,7 +160,7 @@ public class DSNBounceTest {
.attribute("delivery-error", "Delivery error")
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
@@ -202,7 +202,7 @@ public class DSNBounceTest {
.attribute("delivery-error", "Delivery error")
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
@@ -242,7 +242,7 @@ public class DSNBounceTest {
.attribute("delivery-error", "Delivery error")
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.remoteAddr("remoteHost")
.build();
@@ -281,7 +281,7 @@ public class DSNBounceTest {
.attribute("delivery-error", "Delivery error")
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.remoteAddr("remoteHost")
.build();
@@ -305,7 +305,7 @@ public class DSNBounceTest {
.attribute("delivery-error", "Delivery error")
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.remoteAddr("remoteHost")
.build();
@@ -330,7 +330,7 @@ public class DSNBounceTest {
.attribute("delivery-error", "Delivery error")
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.remoteAddr("remoteHost")
.build();
@@ -356,7 +356,7 @@ public class DSNBounceTest {
.sender(senderMailAddress)
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
@@ -388,7 +388,7 @@ public class DSNBounceTest {
.sender(senderMailAddress)
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
@@ -422,7 +422,7 @@ public class DSNBounceTest {
.sender(senderMailAddress)
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
@@ -456,7 +456,7 @@ public class DSNBounceTest {
.sender(senderMailAddress)
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
@@ -488,7 +488,7 @@ public class DSNBounceTest {
.sender(senderMailAddress)
.mimeMessage(mimeMessage)
.name(MAILET_NAME)
- .recipient(new MailAddress("recipient@domain.com"))
+ .recipient("recipient@domain.com")
.lastUpdated(DateTime.parse("2016-09-08T14:25:52.000Z").toDate())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
index dde9d3f..eb0e66f 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
@@ -137,7 +137,7 @@ public class LocalDeliveryTest {
.filename("file.txt")
.addHeader("Content-Type", "application/sieve; charset=UTF-8")))
.state(Mail.DEFAULT)
- .recipient(new MailAddress("receiver@domain.com"))
+ .recipient("receiver@domain.com")
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
index 8ead6a7..a733c9e 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
@@ -271,8 +271,8 @@ public class SieveIntegrationTest {
.mimeMessage(MimeMessageBuilder.mimeMessageFromStream(
ClassLoader.getSystemResourceAsStream("eml/gmail.eml")))
.state(Mail.DEFAULT)
- .recipient(new MailAddress(RECEIVER_DOMAIN_COM))
- .sender(new MailAddress("sender@any.com"))
+ .recipient(RECEIVER_DOMAIN_COM)
+ .sender("sender@any.com")
.build();
testee.service(mail);
@@ -426,7 +426,7 @@ public class SieveIntegrationTest {
assertThat(mail.getRecipients()).isEmpty();
FakeMailContext.SentMail expectedSentMail = FakeMailContext.sentMailBuilder()
- .sender(new MailAddress("sender@any.com"))
+ .sender("sender@any.com")
.recipient(new MailAddress("redirect@apache.org"))
.fromMailet()
.build();
@@ -793,7 +793,7 @@ public class SieveIntegrationTest {
// Notification of script interpretation failure
assertThat(fakeMailContext.getSentMails()).containsExactly(FakeMailContext.sentMailBuilder()
- .recipient(new MailAddress(RECEIVER_DOMAIN_COM))
+ .recipient(RECEIVER_DOMAIN_COM)
.sender(new MailAddress(RECEIVER_DOMAIN_COM))
.fromMailet()
.build());
@@ -963,8 +963,8 @@ public class SieveIntegrationTest {
.filename("file.txt")
.disposition(MimeBodyPart.ATTACHMENT)))
.state(Mail.DEFAULT)
- .recipient(new MailAddress(RECEIVER_DOMAIN_COM))
- .sender(new MailAddress("sender@any.com"))
+ .recipient(RECEIVER_DOMAIN_COM)
+ .sender("sender@any.com")
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
index 3ee7c81..0273ddf 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
@@ -199,7 +199,7 @@ public class ToRecipientFolderTest {
.filename("file.txt")
.addHeader("Content-Type", "application/sieve; charset=UTF-8")))
.state(Mail.DEFAULT)
- .recipient(new MailAddress("receiver@domain.com"))
+ .recipient("receiver@domain.com")
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
index c4afffa..2dcb91a 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
@@ -476,8 +476,8 @@ public class ManageSieveMailetTestCase {
private Mail createUnauthenticatedMail(MimeMessage message) throws Exception {
return FakeMail.builder()
.mimeMessage(message)
- .sender(new MailAddress(USER))
- .recipient(new MailAddress(SIEVE_LOCALHOST))
+ .sender(USER)
+ .recipient(SIEVE_LOCALHOST)
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
index e4e2c58..10c7963 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
@@ -28,10 +28,10 @@ import java.util.Collection;
import javax.mail.MessagingException;
+import org.apache.james.core.MailAddress;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.mock.MockDNSService;
import org.apache.mailet.Mail;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Test;
@@ -59,7 +59,7 @@ public class InSpammerBlacklistTest {
private Mail createMail(String remoteAddr) throws MessagingException {
return FakeMail.builder()
.remoteAddr(remoteAddr)
- .recipient(new MailAddress("test@email"))
+ .recipient("test@email")
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index 504593c..b2e3bfd 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -56,7 +56,6 @@ import javax.mail.internet.MimeMessage;
import org.apache.commons.io.IOUtils;
import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.core.MailAddress;
import org.apache.james.jmap.DefaultMailboxes;
import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
@@ -4917,8 +4916,8 @@ public abstract class SetMessagesMethodTest {
Mail mail = FakeMail.builder()
.mimeMessage(calendarMessage)
- .sender(new MailAddress(fromAddress))
- .recipient(new MailAddress(fromAddress))
+ .sender(fromAddress)
+ .recipient(fromAddress)
.build();
try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, USERS_DOMAIN);) {
messageSender.sendMessage(mail);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java
index 6890acf..ee978fa 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java
@@ -33,6 +33,7 @@ import java.util.concurrent.CompletableFuture;
import javax.mail.MessagingException;
+import org.apache.james.core.MailAddress;
import org.apache.james.jmap.api.vacation.AccountId;
import org.apache.james.jmap.api.vacation.NotificationRegistry;
import org.apache.james.jmap.api.vacation.RecipientId;
@@ -40,7 +41,6 @@ import org.apache.james.jmap.api.vacation.Vacation;
import org.apache.james.jmap.api.vacation.VacationRepository;
import org.apache.james.jmap.utils.MimeMessageBodyGenerator;
import org.apache.james.util.date.ZonedDateTimeProvider;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.MailetContext;
import org.apache.mailet.base.AutomaticallySentMailDetector;
import org.apache.mailet.base.test.FakeMail;
@@ -190,7 +190,7 @@ public class VacationMailetTest {
FakeMail mail = FakeMail.builder()
.fileName("spamMail.eml")
- .recipients(ImmutableList.of(originalRecipient, secondRecipient))
+ .recipients(originalRecipient, secondRecipient)
.sender(originalSender)
.build();
when(vacationRepository.retrieveVacation(AccountId.fromString(USERNAME)))
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index 988bb6f..1a1b9fc 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -36,6 +36,11 @@
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ca7051aa/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
index f719c3e..9370ccd 100644
--- a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
+++ b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
@@ -33,6 +33,7 @@ import javax.mail.MessagingException;
import org.apache.commons.net.smtp.AuthenticatingSMTPClient;
import org.apache.james.core.MailAddress;
import org.apache.mailet.Mail;
+import org.apache.mailet.base.test.FakeMail;
import org.junit.rules.ExternalResource;
import com.github.fge.lambdas.Throwing;
@@ -148,6 +149,10 @@ public class SMTPMessageSender extends ExternalResource implements Closeable {
return this;
}
+ public SMTPMessageSender sendMessage(FakeMail.Builder mail) throws MessagingException {
+ return sendMessage(mail.build());
+ }
+
private String asString(Message message) throws IOException, MessagingException {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
message.writeTo(outputStream);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[34/44] james-project git commit: JAMES-2267 Factorize Mailet
container configuration a bit further
Posted by bt...@apache.org.
JAMES-2267 Factorize Mailet container configuration a bit further
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5f658784
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5f658784
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5f658784
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 5f6587841a6bf64e59974f98a26bdf32b2fef291
Parents: ea8b4de
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 10:58:41 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
.../james/mailets/BounceIntegrationTest.java | 6 +-----
.../GatewayRemoteDeliveryIntegrationTest.java | 19 ++++---------------
.../mailets/NetworkMatcherIntegrationTest.java | 9 +--------
.../james/mailets/SmtpAuthIntegrationTest.java | 15 ++-------------
.../mailets/configuration/CommonProcessors.java | 18 ++++++++++++++----
.../configuration/MailetConfiguration.java | 13 +++++++++++++
.../james/smtp/SmtpAuthorizedAddressesTest.java | 13 ++-----------
.../transport/mailets/GroupMappingTest.java | 11 +----------
8 files changed, 38 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 6b67274..1e686a7 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
@@ -41,7 +41,6 @@ import org.apache.james.transport.mailets.NotifyPostmaster;
import org.apache.james.transport.mailets.NotifySender;
import org.apache.james.transport.mailets.Redirect;
import org.apache.james.transport.mailets.Resend;
-import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIs;
import org.apache.james.utils.DataProbeImpl;
@@ -271,10 +270,7 @@ public class BounceIntegrationTest {
.matcher(RecipientIs.class)
.matcherCondition(POSTMASTER)
.mailet(LocalDelivery.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES))
+ .addMailet(MailetConfiguration.TO_BOUNCE)
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 7bfc074..f5d3818 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -43,7 +43,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.util.docker.Images;
@@ -216,7 +215,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .addProcessor(root())
+ .addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
.addProcessor(CommonProcessors.bounces()))
@@ -247,7 +246,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .addProcessor(root())
+ .addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
@@ -289,7 +288,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .addProcessor(root())
+ .addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(directResolutionTransport())
.addProcessor(CommonProcessors.bounces()))
@@ -315,23 +314,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
private MailetContainer generateMailetContainerConfiguration(String gatewayProperty) {
return MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .addProcessor(root())
+ .addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(relayOnlyTransport(gatewayProperty))
.addProcessor(CommonProcessors.bounces())
.build();
}
- public ProcessorConfiguration root() {
- // Custom in memory DNS resolution is not possible combined with InSpamerBackList
- return ProcessorConfiguration.root()
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", "transport"))
- .build();
- }
-
private ProcessorConfiguration relayOnlyTransport(String gatewayProperty) {
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index da7c3d8..f8e41c6 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -66,7 +66,7 @@ public class NetworkMatcherIntegrationTest {
.withMailetContainer(MailetContainer.builder()
.addProcessor(rootProcessor)
.addProcessor(CommonProcessors.error())
- .addProcessor(deliverOnlyTransport()))
+ .addProcessor(CommonProcessors.deliverOnlyTransport()))
.build(temporaryFolder);
DataProbe dataProbe = temporaryJamesServer.getProbe(DataProbeImpl.class);
@@ -75,13 +75,6 @@ public class NetworkMatcherIntegrationTest {
return temporaryJamesServer;
}
- private ProcessorConfiguration deliverOnlyTransport() {
- return ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY)
- .build();
- }
-
private MailetConfiguration.Builder toRepository() {
return MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/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 a3b7eae..61faf23 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
@@ -68,18 +68,14 @@ public class SmtpAuthIntegrationTest {
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES))
+ .addMailet(MailetConfiguration.TO_BOUNCE)
.build();
MailetContainer mailetContainer = MailetContainer.builder()
.addProcessor(rootProcessor)
.addProcessor(CommonProcessors.error())
- .addProcessor(deliverOnlyTransport())
+ .addProcessor(CommonProcessors.deliverOnlyTransport())
.addProcessor(bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck())
.build();
jamesServer = TemporaryJamesServer.builder()
@@ -93,13 +89,6 @@ public class SmtpAuthIntegrationTest {
repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
}
- private ProcessorConfiguration deliverOnlyTransport() {
- return ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY)
- .build();
- }
-
private ProcessorConfiguration bounces() {
return ProcessorConfiguration.bounces()
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index a3f9a4a..35620d3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -87,13 +87,16 @@ public class CommonProcessors {
.mailet(ToProcessor.class)
.addProperty("processor", ProcessorConfiguration.STATE_SPAM)
.addProperty("notice", "550 Requested action not taken: rejected - see http://njabl.org/"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
+ .addMailet(MailetConfiguration.TO_TRANSPORT)
.build();
}
+ public static ProcessorConfiguration simpleRoot() {
+ return ProcessorConfiguration.root()
+ .addMailet(MailetConfiguration.TO_TRANSPORT)
+ .build();
+ }
+
public static ProcessorConfiguration error() {
return ProcessorConfiguration.error()
.enableJmx(true)
@@ -154,6 +157,13 @@ public class CommonProcessors {
.build();
}
+ public static ProcessorConfiguration deliverOnlyTransport() {
+ return ProcessorConfiguration.transport()
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY)
+ .build();
+ }
+
public static ProcessorConfiguration spam() {
return ProcessorConfiguration.spam()
.enableJmx(true)
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
index 9241aa4..17c27d7 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
@@ -25,6 +25,7 @@ import java.util.Optional;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.RemoveMimeHeader;
+import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.mailet.Mailet;
@@ -90,6 +91,18 @@ public class MailetConfiguration implements SerializableAsXml {
.mailet(LocalDelivery.class)
.build();
+ public static final MailetConfiguration TO_TRANSPORT = MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ToProcessor.class)
+ .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)
+ .build();
+
+ public static final MailetConfiguration TO_BOUNCE = MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ToProcessor.class)
+ .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)
+ .build();
+
private final Class<? extends Matcher> matcher;
private final Optional<String> matcherCondition;
private final Class<? extends Mailet> mailet;
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/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 0af382f..14f5f4f 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
@@ -37,8 +37,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.ToProcessor;
-import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.SMTPIsAuthNetwork;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
@@ -87,11 +85,7 @@ public class SmtpAuthorizedAddressesTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(ProcessorConfiguration.root()
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
+ .addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
@@ -107,10 +101,7 @@ public class SmtpAuthorizedAddressesTest {
.addProperty("sendpartial", "true")
.addProperty("bounceProcessor", ProcessorConfiguration.STATE_BOUNCES)
.addProperty("gateway", fakeSmtp.getContainerIp()))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_BOUNCES)))
+ .addMailet(MailetConfiguration.TO_BOUNCE))
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
http://git-wip-us.apache.org/repos/asf/james-project/blob/5f658784/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 bb9880f..9a95c42 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
@@ -48,7 +48,6 @@ import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
-import org.apache.james.transport.matchers.RelayLimit;
import org.apache.james.util.docker.Images;
import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
@@ -107,15 +106,7 @@ public class GroupMappingTest {
inMemoryDNSService.registerRecord("yopmail.com", containerIp, "yopmail.com");
MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(ProcessorConfiguration.root()
- .addMailet(MailetConfiguration.builder()
- .matcher(RelayLimit.class)
- .matcherCondition("30")
- .mailet(Null.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT)))
+ .addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[35/44] james-project git commit: JAMES-2267 INBOX creation is
generally not needed
Posted by bt...@apache.org.
JAMES-2267 INBOX creation is generally not needed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8f082d3c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8f082d3c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8f082d3c
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 8f082d3ce8ecaef43f3cff49d546810dc65f5c65
Parents: c096920
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 09:28:44 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
.../GatewayRemoteDeliveryIntegrationTest.java | 11 ++------
.../RecipientRewriteTableIntegrationTest.java | 29 ++++++++------------
.../james/mailets/SmtpAuthIntegrationTest.java | 2 --
.../crypto/SMIMEDecryptIntegrationTest.java | 5 ----
.../crypto/SMIMESignIntegrationTest.java | 4 ---
.../mailets/AmqpForwardAttachmentTest.java | 3 --
.../mailets/ICSAttachmentWorkflowTest.java | 3 --
.../transport/mailets/StripAttachmentTest.java | 3 --
8 files changed, 13 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index f6bf420..afb5546 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -46,7 +46,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
@@ -261,10 +260,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class))
@@ -358,10 +354,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
private ProcessorConfiguration relayOnlyTransport(String gatewayProperty) {
return ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc"))
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoteDelivery.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index c07852a..01fb9bd 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -26,8 +26,6 @@ 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.awaitOneMinute;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -76,8 +74,8 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void rrtServiceShouldDeliverEmailToMappingRecipients() throws Exception {
dataProbe.addUser(FROM, PASSWORD);
- createUserInbox(ANY_AT_JAMES);
- createUserInbox(OTHER_AT_JAMES);
+ dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
+ dataProbe.addUser(OTHER_AT_JAMES, PASSWORD);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
@@ -99,9 +97,9 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void rrtServiceShouldNotDeliverEmailToRecipientWhenHaveMappingRecipients() throws Exception {
dataProbe.addUser(FROM, PASSWORD);
- createUserInbox(RECIPIENT);
- createUserInbox(ANY_AT_JAMES);
- createUserInbox(OTHER_AT_JAMES);
+ dataProbe.addUser(RECIPIENT, PASSWORD);
+ dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
+ dataProbe.addUser(OTHER_AT_JAMES, PASSWORD);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
@@ -121,8 +119,8 @@ public class RecipientRewriteTableIntegrationTest {
String nonDomainUser = "nondomain";
String localUser = nonDomainUser + "@" + dataProbe.getDefaultDomain();
dataProbe.addUser(FROM, PASSWORD);
- createUserInbox(localUser);
- createUserInbox(OTHER_AT_JAMES);
+ dataProbe.addUser(localUser, PASSWORD);
+ dataProbe.addUser(OTHER_AT_JAMES, PASSWORD);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, nonDomainUser);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
@@ -144,8 +142,8 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void messageShouldRedirectToTheSameUserWhenDomainMapping() throws Exception {
dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
- createUserInbox(ANY_AT_JAMES);
- createUserInbox(ANY_AT_ANOTHER_DOMAIN);
+ dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
+ dataProbe.addUser(ANY_AT_ANOTHER_DOMAIN, PASSWORD);
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, ANY_AT_JAMES)
@@ -160,8 +158,8 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void messageShouldNotSendToRecipientWhenDomainMapping() throws Exception {
dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
- createUserInbox(ANY_AT_JAMES);
- createUserInbox(ANY_AT_ANOTHER_DOMAIN);
+ dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
+ dataProbe.addUser(ANY_AT_ANOTHER_DOMAIN, PASSWORD);
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, ANY_AT_JAMES)
@@ -173,9 +171,4 @@ public class RecipientRewriteTableIntegrationTest {
awaitOneMinute.until(imapMessageReader::userDoesNotReceiveMessage);
}
- private void createUserInbox(String username) throws Exception {
- dataProbe.addUser(username, PASSWORD);
- jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, username, "INBOX");
- }
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/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 6f6f9db..bd0ebca 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
@@ -95,7 +95,6 @@ public class SmtpAuthIntegrationTest {
private ProcessorConfiguration deliverOnlyTransport() {
return ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -105,7 +104,6 @@ public class SmtpAuthIntegrationTest {
private ProcessorConfiguration bounces() {
return ProcessorConfiguration.bounces()
- .enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToRepository.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/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 e267fc3..9e2bb06 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
@@ -30,13 +30,11 @@ import java.time.ZonedDateTime;
import org.apache.commons.io.IOUtils;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.mailbox.model.MailboxConstants;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.SMIMEDecrypt;
import org.apache.james.transport.matchers.All;
@@ -72,7 +70,6 @@ public class SMIMEDecryptIntegrationTest {
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.mailet(SMIMEDecrypt.class)
@@ -95,8 +92,6 @@ public class SMIMEDecryptIntegrationTest {
DataProbeImpl serverProbe = jamesServer.getProbe(DataProbeImpl.class);
serverProbe.addDomain(DEFAULT_DOMAIN);
serverProbe.addUser(FROM, PASSWORD);
- MailboxProbeImpl mailboxProbe = jamesServer.getProbe(MailboxProbeImpl.class);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, FROM, "INBOX");
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/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 4c67734..4d6ec0b 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
@@ -29,13 +29,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.time.ZonedDateTime;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.mailbox.model.MailboxConstants;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.james.transport.mailets.SMIMESign;
@@ -75,7 +73,6 @@ public class SMIMESignIntegrationTest {
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
- .enableJmx(true)
.addMailet(MailetConfiguration.builder()
.matcher(HasMailAttribute.class)
.matcherCondition("org.apache.james.SMIMECheckSignature")
@@ -110,7 +107,6 @@ public class SMIMESignIntegrationTest {
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
- jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/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 c3fb08d..18e8c0e 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
@@ -30,13 +30,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.mailbox.model.MailboxConstants;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
@@ -116,7 +114,6 @@ public class AmqpForwardAttachmentTest {
DataProbe dataprobe = jamesServer.getProbe(DataProbeImpl.class);
dataprobe.addDomain(DEFAULT_DOMAIN);
dataprobe.addUser(RECIPIENT, PASSWORD);
- jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/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 9930c29..3532f4b 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
@@ -34,13 +34,11 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.mailet.TextCalendarBodyToAttachment;
-import org.apache.james.mailbox.model.MailboxConstants;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
@@ -501,7 +499,6 @@ public class ICSAttachmentWorkflowTest {
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
- jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
messageWithoutICSAttached = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
http://git-wip-us.apache.org/repos/asf/james-project/blob/8f082d3c/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 b88a6a7..4929ca8 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
@@ -30,13 +30,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.mailbox.model.MailboxConstants;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
-import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
@@ -97,7 +95,6 @@ public class StripAttachmentTest {
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
- jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
}
@After
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[18/44] james-project git commit: JAMES-2267 ImapMessageReader should
be a test rule
Posted by bt...@apache.org.
JAMES-2267 ImapMessageReader should be a test rule
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/456972f7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/456972f7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/456972f7
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 456972f78f656c4c113a9a106c83971fd732b821
Parents: fe92484
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 15:53:30 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 15 +-
.../james/mailets/BounceIntegrationTest.java | 66 ++++----
.../mailets/CommonMailetConfigurationTest.java | 11 +-
.../GatewayRemoteDeliveryIntegrationTest.java | 21 +--
.../mailets/NetworkMatcherIntegrationTest.java | 76 +++++----
.../RecipientRewriteTableIntegrationTest.java | 55 +++++--
.../org/apache/james/mailets/SieveDelivery.java | 11 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 22 ++-
.../crypto/SMIMEDecryptIntegrationTest.java | 34 ++--
.../crypto/SMIMESignIntegrationTest.java | 22 ++-
.../james/smtp/SmtpAuthorizedAddressesTest.java | 13 +-
.../mailets/AmqpForwardAttachmentTest.java | 15 +-
.../transport/mailets/ContactExtractorTest.java | 18 ++-
.../transport/mailets/GroupMappingTest.java | 162 ++++++++++++-------
.../mailets/ICSAttachmentWorkflowTest.java | 110 ++++++++-----
.../transport/mailets/StripAttachmentTest.java | 14 +-
.../integration/SetMessagesMethodTest.java | 6 +-
.../integration/cucumber/ImapStepdefs.java | 60 +++----
.../apache/james/utils/IMAPMessageReader.java | 79 +++++----
19 files changed, 495 insertions(+), 315 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index c0d4aae..4464056 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -21,6 +21,7 @@ package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
@@ -45,6 +46,8 @@ public class AddDeliveredToHeaderTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -71,12 +74,16 @@ public class AddDeliveredToHeaderTest {
jamesServer.getProbe(MailboxProbeImpl.class)
.createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX");
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(from, recipient)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.readFirstMessageHeadersInInbox(recipient, PASSWORD)
- .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + recipient));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(recipient, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessageHeaders())
+ .contains(AddDeliveredToHeader.DELIVERED_TO + ": " + recipient);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index ee269fb..b00b57e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
@@ -23,7 +23,6 @@ import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.configuration.CommonProcessors;
import org.apache.james.mailets.configuration.MailetConfiguration;
import org.apache.james.mailets.configuration.MailetContainer;
@@ -61,6 +60,8 @@ public class BounceIntegrationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
private DataProbe dataProbe;
@@ -86,12 +87,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -111,12 +113,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -136,12 +139,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -162,12 +166,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -188,12 +193,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -213,12 +219,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(BOUNCE_RECEIVER, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(BOUNCE_RECEIVER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -238,12 +245,13 @@ public class BounceIntegrationTest {
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(POSTMASTER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(POSTMASTER, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(POSTMASTER, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 285de39..1a7e217 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -44,6 +44,8 @@ public class CommonMailetConfigurationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -71,11 +73,14 @@ public class CommonMailetConfigurationTest {
dataProbe.addUser(recipient, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX");
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(from, recipient)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(recipient, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(recipient, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 5c2c3e7..0dbb573 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.InMemoryDNSService;
-import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.configuration.CommonProcessors;
import org.apache.james.mailets.configuration.MailetConfiguration;
import org.apache.james.mailets.configuration.MailetContainer;
@@ -78,6 +77,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private final TemporaryFolder smtpFolder = new TemporaryFolder();
private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
@@ -241,12 +242,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
dataProbe.addDomain(JAMES_APACHE_ORG);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -289,12 +291,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
dataProbe.addDomain(JAMES_APACHE_ORG);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT);
- calmlyAwait.atMost(ONE_MINUTE).until(() ->
- imapMessageReader.userReceivedMessageInMailbox(FROM, PASSWORD, MailboxConstants.INBOX));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 709b3fe..eba6574 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -56,6 +56,8 @@ public class NetworkMatcherIntegrationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -106,14 +108,15 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -128,14 +131,15 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -150,14 +154,15 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -172,14 +177,15 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -194,14 +200,15 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -216,14 +223,15 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -238,15 +246,19 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
- assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse();
+ assertThat(
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .hasAMessage())
+ .isFalse();
}
}
@@ -261,15 +273,19 @@ public class NetworkMatcherIntegrationTest {
.addMailet(toRepository()));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
- assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse();
+ assertThat(
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .hasAMessage())
+ .isFalse();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index 007a064..58b69e3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -53,6 +53,8 @@ public class RecipientRewriteTableIntegrationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
private DataProbe dataProbe;
@@ -82,12 +84,18 @@ public class RecipientRewriteTableIntegrationTest {
dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_JAMES, PASSWORD));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(ANY_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(OTHER_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -102,12 +110,14 @@ public class RecipientRewriteTableIntegrationTest {
dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(RECIPIENT, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
}
}
@@ -124,13 +134,18 @@ public class RecipientRewriteTableIntegrationTest {
dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, nonDomainUser);
dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(OTHER_AT_JAMES, PASSWORD));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(localUser, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(localUser, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(OTHER_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -141,11 +156,14 @@ public class RecipientRewriteTableIntegrationTest {
createUserInbox(ANY_AT_JAMES);
createUserInbox(ANY_AT_ANOTHER_DOMAIN);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, ANY_AT_JAMES)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(ANY_AT_ANOTHER_DOMAIN, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(ANY_AT_ANOTHER_DOMAIN, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -156,11 +174,14 @@ public class RecipientRewriteTableIntegrationTest {
createUserInbox(ANY_AT_JAMES);
createUserInbox(ANY_AT_ANOTHER_DOMAIN);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, ANY_AT_JAMES)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(ANY_AT_JAMES, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(ANY_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
index b5edede..40666af 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java
@@ -46,6 +46,8 @@ public class SieveDelivery {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -76,11 +78,14 @@ public class SieveDelivery {
"\n" +
"fileinto \"" + targetedMailbox + "\";");
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);) {
messageSender.sendMessage(from, recipient)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessageInMailbox(recipient, PASSWORD, targetedMailbox));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(recipient, PASSWORD)
+ .select(targetedMailbox)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
index dd3f113..53e96e5 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
@@ -54,7 +54,8 @@ public class SmtpAuthIntegrationTest {
private static final String FROM = "fromuser@" + JAMES_APACHE_ORG;
private static final String DROPPED_MAILS = "file://var/mail/dropped-mails/";
-
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -118,29 +119,34 @@ public class SmtpAuthIntegrationTest {
@Test
public void authenticatedSmtpSessionsShouldBeDelivered() throws Exception {
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@Test
public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception {
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
- assertThat(imapMessageReader.userReceivedMessage(FROM, PASSWORD)).isFalse();
+ assertThat(
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .hasAMessage())
+ .isFalse();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
index e5f5f44..c95a095 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
@@ -61,6 +61,8 @@ public class SMIMEDecryptIntegrationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -105,29 +107,33 @@ public class SMIMEDecryptIntegrationTest {
@Test
public void cryptedMessageShouldBeDecryptedWhenCertificateMatches() throws Exception {
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
+
messageSender.sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted.eml"), StandardCharsets.US_ASCII))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
- assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD))
- .containsSequence("Crypted content");
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).containsSequence("Crypted content");
}
}
@Test
public void cryptedMessageWithAttachmentShouldBeDecryptedWhenCertificateMatches() throws Exception {
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
messageSender.sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/crypted_with_attachment.eml"), StandardCharsets.US_ASCII))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
- assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD))
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage())
.containsSequence("Crypted Content with attachment");
}
}
@@ -135,14 +141,16 @@ public class SMIMEDecryptIntegrationTest {
@Test
public void cryptedMessageShouldNotBeDecryptedWhenCertificateDoesntMatch() throws Exception {
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
messageSender.sendMessageWithHeaders(FROM, FROM,
IOUtils.toString(ClassLoader.getSystemResourceAsStream("eml/bad_crypted.eml"), StandardCharsets.US_ASCII))
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
- assertThat(imapMessageReader.readFirstMessageInInbox(FROM, PASSWORD))
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage())
.containsSequence("MIAGCSqGSIb3DQEHA6CAMIACAQAxggKpMIICpQIBADCBjDCBhjELMAkGA1UE");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
index 531d96c..366513d 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -62,6 +62,8 @@ public class SMIMESignIntegrationTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
public static final String FROM = "user@" + DEFAULT_DOMAIN;
@@ -119,26 +121,30 @@ public class SMIMESignIntegrationTest {
@Test
public void authenticatedMessagesShouldBeSigned() throws Exception {
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD))
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ assertThat(imapMessageReader.readFirstMessage())
.containsSequence("Content-Description: S/MIME Cryptographic Signature");
}
}
@Test
public void NonAuthenticatedMessagesShouldNotBeSigned() throws Exception {
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- assertThat(imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD))
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ assertThat(imapMessageReader.readFirstMessage())
.doesNotContain("Content-Description: S/MIME Cryptographic Signature");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
index cf92df2..f09218a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -76,7 +76,9 @@ public class SmtpAuthorizedAddressesTest {
.waitingFor(new HostPortWaitStrategy());
@Rule
- public final RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp);
+ public RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp);
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -201,14 +203,15 @@ public class SmtpAuthorizedAddressesTest {
.withAutorizedAddresses("172.0.0.0/8"));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(TO, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imapMessageReader.userReceivedMessage(FROM, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
index 6f11b48..6218137 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -79,6 +79,8 @@ public class AmqpForwardAttachmentTest {
@Rule
public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -145,11 +147,14 @@ public class AmqpForwardAttachmentTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
assertThat(amqpRule.readContentAsBytes()).contains(TEST_ATTACHMENT_CONTENT);
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
index 268be0b..164fae9 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -51,6 +51,10 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
public class ContactExtractorTest {
+ private static final String LOCALHOST_IP = "127.0.0.1";
+ private static final int IMAP_PORT = 1143;
+ private static final int SMTP_PORT = 1025;
+ private static final String JAMES_APACHE_ORG = "james.org";
public static final String JAMES_ORG = "james.org";
public static final String SENDER = "sender@" + JAMES_ORG;
@@ -70,6 +74,8 @@ public class ContactExtractorTest {
@Rule
public RuleChain chain = RuleChain.outerRule(rabbit).around(amqpRule).around(folder);
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -131,12 +137,14 @@ public class ContactExtractorTest {
.sender(new MailAddress(SENDER))
.recipients(new MailAddress(TO), new MailAddress(TO2), new MailAddress(CC), new MailAddress(CC2), new MailAddress(BCC), new MailAddress(BCC2))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication("localhost", 1025, JAMES_ORG, SENDER, PASSWORD);
- IMAPMessageReader imap = new IMAPMessageReader("localhost", 1143)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(ONE_MINUTE)
- .until(() -> imap.userReceivedMessage(TO, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(TO, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
Optional<String> actual = amqpRule.readContent();
assertThat(actual).isNotEmpty();
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
index 3aeb402..7c2fd11 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -96,6 +96,8 @@ public class GroupMappingTest {
private final InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private InetAddress containerIp;
@Before
@@ -181,15 +183,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
-
- String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN1, PASSWORD);
- assertThat(processedMessage).contains(MESSAGE_CONTENT);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
}
@@ -204,15 +206,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
-
- String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN2, PASSWORD);
- assertThat(processedMessage).contains(MESSAGE_CONTENT);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
}
@@ -228,12 +230,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN2, PASSWORD, 1));
+
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -249,15 +258,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
-
- String processedMessage = imapMessageReader.readFirstMessageInInbox(USER_DOMAIN2, PASSWORD);
- assertThat(processedMessage).contains(MESSAGE_CONTENT);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
}
@@ -275,11 +284,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -293,11 +305,14 @@ public class GroupMappingTest {
.recipients(new MailAddress(GROUP_ON_DOMAIN1), new MailAddress(USER_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.countReceivedMessage(USER_DOMAIN1, PASSWORD, 1));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -315,12 +330,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN2))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -340,13 +362,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHaveNotBeenSent);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN2, PASSWORD));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -362,11 +390,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -382,11 +413,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userDoesNotReceiveMessage(USER_DOMAIN1, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
}
}
@@ -402,11 +436,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN2, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -422,11 +459,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(groupWithSlash))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -443,11 +483,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(userWithSlash, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(userWithSlash, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
@@ -463,11 +506,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(USER_DOMAIN1, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
index e9249e9..799f210 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -440,7 +440,9 @@ public class ICSAttachmentWorkflowTest {
public AmqpRule amqpRule = new AmqpRule(rabbitMqContainer, EXCHANGE_NAME, ROUTING_KEY);
@Rule
- public final RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
+ public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
private MimeMessage messageWithoutICSAttached;
@@ -572,11 +574,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
assertThat(amqpRule.readContent()).isEmpty();
@@ -590,11 +595,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageHasBeenSent);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ messageSender.sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
Optional<String> content = amqpRule.readContent();
@@ -624,13 +632,15 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).doesNotContain("X-MEETING-UID");
assertThat(receivedHeaders).doesNotContain("X-MEETING-METHOD");
@@ -648,13 +658,15 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
@@ -671,13 +683,15 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_BASE64_UID);
assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
@@ -694,11 +708,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
Optional<String> content = amqpRule.readContent();
@@ -721,11 +738,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
Optional<String> content = amqpRule.readContent();
@@ -749,13 +769,15 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ String receivedHeaders = imapMessageReader.readFirstMessageHeaders();
assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
@@ -772,11 +794,14 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
Optional<String> content1 = amqpRule.readContent();
@@ -811,15 +836,16 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
-
- String receivedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD);
- assertThat(receivedMessage).containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment");
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage())
+ .containsSequence("Content-Type: multipart/mixed", "Content-Disposition: attachment");
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/456972f7/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
index 3efb6eb..07ebb67 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -63,6 +63,8 @@ public class StripAttachmentTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
@@ -137,13 +139,15 @@ public class StripAttachmentTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- calmlyAwait.atMost(ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- String processedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD);
- assertThat(processedMessage).contains("Matching attachment");
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains("Matching attachment");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[41/44] james-project git commit: JAMES-2262 Provide a FakeSmtp
wrapper class
Posted by bt...@apache.org.
JAMES-2262 Provide a FakeSmtp wrapper class
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1d9f9dfb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1d9f9dfb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1d9f9dfb
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 1d9f9dfb2e33a2c0c95743b40ef9233a15340515
Parents: b5efd2f
Author: benwa <bt...@linagora.com>
Authored: Mon Dec 25 11:11:08 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:39 2018 +0700
----------------------------------------------------------------------
.../apache/james/mpt/smtp/ForwardSmtpTest.java | 25 ++----
.../GatewayRemoteDeliveryIntegrationTest.java | 52 ++++-------
.../james/smtp/SmtpAuthorizedAddressesTest.java | 27 ++----
.../transport/mailets/GroupMappingTest.java | 40 ++-------
.../jmap/VacationRelayIntegrationTest.java | 20 ++---
server/testing/pom.xml | 9 ++
.../java/org/apache/james/utils/FakeSmtp.java | 91 ++++++++++++++++++++
.../org/apache/james/utils/FakeSmtpHelper.java | 56 ------------
8 files changed, 144 insertions(+), 176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index bcfdd5d..37b691a 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -25,20 +25,14 @@ import static org.hamcrest.Matchers.equalTo;
import java.util.Locale;
import org.apache.james.mpt.script.SimpleScriptedTestProtocol;
-import org.apache.james.util.docker.Images;
-import org.apache.james.util.docker.SwarmGenericContainer;
-import org.apache.james.utils.FakeSmtpHelper;
+import org.apache.james.utils.FakeSmtp;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
-import org.testcontainers.containers.wait.HostPortWaitStrategy;
import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
-import com.jayway.restassured.RestAssured;
public abstract class ForwardSmtpTest {
@@ -47,14 +41,9 @@ public abstract class ForwardSmtpTest {
public static final String USER_AT_DOMAIN = USER + "@" + DOMAIN;
public static final String PASSWORD = "secret";
- private final TemporaryFolder folder = new TemporaryFolder();
- private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
- .withExposedPorts(25)
- .withAffinityToContainer()
- .waitingFor(new HostPortWaitStrategy());
-
@Rule
- public final RuleChain chain = RuleChain.outerRule(folder).around(fakeSmtp);
+ public FakeSmtp fakeSmtp = new FakeSmtp();
+
private ConditionFactory calmlyAwait;
protected abstract SmtpHostSystem createSmtpHostSystem();
@@ -71,11 +60,9 @@ public abstract class ForwardSmtpTest {
.withUser(USER_AT_DOMAIN, PASSWORD);
hostSystem.getInMemoryDnsService()
- .registerMxRecord("yopmail.com", fakeSmtp.getContainerIp());
+ .registerMxRecord("yopmail.com", fakeSmtp.getContainer().getContainerIp());
hostSystem.addAddressMapping(USER, DOMAIN, "ray@yopmail.com");
- RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
-
Duration slowPacedPollInterval = FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with()
.pollInterval(slowPacedPollInterval)
@@ -84,7 +71,7 @@ public abstract class ForwardSmtpTest {
.pollDelay(slowPacedPollInterval)
.await();
- calmlyAwait.atMost(ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ fakeSmtp.awaitStarted(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -92,7 +79,7 @@ public abstract class ForwardSmtpTest {
scriptedTest.run("helo");
calmlyAwait.atMost(ONE_MINUTE).until(() ->
- FakeSmtpHelper.isReceived(response -> response
+ fakeSmtp.isReceived(response -> response
.body("[0].from", equalTo("matthieu@yopmail.com"))
.body("[0].subject", equalTo("test"))
.body("[0].text", equalTo("content"))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index ff55d89..2eb4c77 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -19,7 +19,6 @@
package org.apache.james.mailets;
-import static com.jayway.restassured.RestAssured.when;
import static org.apache.james.MemoryJamesServerMain.SMTP_AND_IMAP_MODULE;
import static org.apache.james.MemoryJamesServerMain.SMTP_ONLY_MODULE;
import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
@@ -28,11 +27,10 @@ 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.awaitOneMinute;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
-import java.util.concurrent.TimeUnit;
-
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -41,21 +39,15 @@ import org.apache.james.mailets.configuration.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.All;
-import org.apache.james.util.docker.Images;
-import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.utils.FakeSmtpHelper;
+import org.apache.james.utils.FakeSmtp;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-import org.testcontainers.containers.wait.HostPortWaitStrategy;
-
-import com.jayway.restassured.RestAssured;
public class GatewayRemoteDeliveryIntegrationTest {
private static final String JAMES_ANOTHER_DOMAIN = "james.com";
@@ -69,15 +61,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
@Rule
public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
-
- private final TemporaryFolder smtpFolder = new TemporaryFolder();
- private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
- .withExposedPorts(25)
- .withAffinityToContainer()
- .waitingFor(new HostPortWaitStrategy());
-
@Rule
- public final RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp);
+ public FakeSmtp fakeSmtp = new FakeSmtp();
private TemporaryJamesServer jamesServer;
private DataProbe dataProbe;
@@ -85,12 +70,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Before
public void setup() throws Exception {
- awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
-
- RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
+ fakeSmtp.awaitStarted(awaitOneMinute);
inMemoryDNSService = new InMemoryDNSService()
- .registerMxRecord(JAMES_ANOTHER_DOMAIN, fakeSmtp.getContainerIp());
+ .registerMxRecord(JAMES_ANOTHER_DOMAIN, fakeSmtp.getContainer().getContainerIp());
}
@After
@@ -102,7 +85,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Test
public void outgoingMailShouldTransitThroughGatewayWhenNoPort() throws Exception {
- String gatewayProperty = fakeSmtp.getContainerIp();
+ String gatewayProperty = fakeSmtp.getContainer().getContainerIp();
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
@@ -121,7 +104,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Test
public void outgoingMailShouldTransitThroughGatewayWhenPort() throws Exception {
- String gatewayProperty = fakeSmtp.getContainerIp() + ":25";
+ String gatewayProperty = fakeSmtp.getContainer().getContainerIp() + ":25";
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
@@ -140,7 +123,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Test
public void outgoingMailShouldTransitThroughGatewayWhenSeveralIps() throws Exception {
- String gatewayProperty = fakeSmtp.getContainerIp() + ",invalid.domain";
+ String gatewayProperty = fakeSmtp.getContainer().getContainerIp() + ",invalid.domain";
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
@@ -159,7 +142,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Test
public void outgoingMailShouldFallbackToSecondGatewayWhenFirstInvalid() throws Exception {
- String gatewayProperty = "invalid.domain," + fakeSmtp.getContainerIp();
+ String gatewayProperty = "invalid.domain," + fakeSmtp.getContainer().getContainerIp();
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
@@ -181,7 +164,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
String gatewayProperty = "invalid.domain";
jamesServer = TemporaryJamesServer.builder()
- .withBase(SMTP_ONLY_MODULE)
+ .withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
.build(temporaryFolder);
@@ -193,12 +176,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT);
- Thread.sleep(TimeUnit.SECONDS.toMillis(5));
- when()
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("", hasSize(0));
+ // Wait for bounce being sent before checking no email is sent
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitOneMinute);
+ assertThat(fakeSmtp.isReceived(response -> response.body("", hasSize(0))))
+ .isTrue();
}
@Test
@@ -276,7 +260,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
}
private boolean messageIsReceivedByTheSmtpServer() {
- return FakeSmtpHelper.isReceived(response -> response
+ return fakeSmtp.isReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
.body("[0].subject", equalTo("test")));
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/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 81b3b1c..5fef6bb 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
@@ -37,39 +37,26 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.SMTPIsAuthNetwork;
-import org.apache.james.util.docker.Images;
-import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.utils.FakeSmtpHelper;
+import org.apache.james.utils.FakeSmtp;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-import org.testcontainers.containers.wait.HostPortWaitStrategy;
-
-import com.jayway.restassured.RestAssured;
public class SmtpAuthorizedAddressesTest {
private static final String FROM = "fromuser@" + DEFAULT_DOMAIN;
private static final String TO = "to@any.com";
- private final TemporaryFolder smtpFolder = new TemporaryFolder();
- private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
- .withExposedPorts(25)
- .withAffinityToContainer()
- .waitingFor(new HostPortWaitStrategy());
-
@Rule
- public RuleChain chain = RuleChain.outerRule(smtpFolder).around(fakeSmtp);
+ public FakeSmtp fakeSmtp = new FakeSmtp();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
@Rule
public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
-
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -77,9 +64,7 @@ public class SmtpAuthorizedAddressesTest {
@Before
public void setup() throws Exception {
- awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
-
- RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
+ fakeSmtp.awaitStarted(awaitOneMinute);
}
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
@@ -88,7 +73,7 @@ public class SmtpAuthorizedAddressesTest {
.addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(SMTPIsAuthNetwork.class)
- .addProperty("gateway", fakeSmtp.getContainerIp()))
+ .addProperty("gateway", fakeSmtp.getContainer().getContainerIp()))
.addMailet(MailetConfiguration.TO_BOUNCE));
jamesServer = TemporaryJamesServer.builder()
@@ -119,7 +104,7 @@ public class SmtpAuthorizedAddressesTest {
.sendMessage(FROM, TO)
.awaitSent(awaitOneMinute);
- awaitOneMinute.until(() -> FakeSmtpHelper.isReceived(response -> response
+ awaitOneMinute.until(() -> fakeSmtp.isReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
.body("[0].subject", equalTo("test"))));
@@ -147,7 +132,7 @@ public class SmtpAuthorizedAddressesTest {
.sendMessage(FROM, TO)
.awaitSent(awaitOneMinute);
- awaitOneMinute.until(() -> FakeSmtpHelper.isReceived(response -> response
+ awaitOneMinute.until(() -> fakeSmtp.isReceived(response -> response
.body("", hasSize(1))
.body("[0].from", equalTo(FROM))
.body("[0].subject", equalTo("test"))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/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 123560f..36dc533 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -19,19 +19,15 @@
package org.apache.james.transport.mailets;
-import static com.jayway.restassured.RestAssured.with;
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.awaitOneMinute;
-import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
-import java.util.concurrent.TimeUnit;
-
import javax.mail.internet.MimeMessage;
import org.apache.james.jmap.mailet.VacationMailet;
@@ -45,9 +41,8 @@ import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
-import org.apache.james.util.docker.Images;
-import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
+import org.apache.james.utils.FakeSmtp;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.apache.james.utils.WebAdminGuiceProbe;
@@ -59,7 +54,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import org.testcontainers.containers.wait.HostPortWaitStrategy;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.specification.RequestSpecification;
@@ -82,11 +76,7 @@ public class GroupMappingTest {
private RequestSpecification restApiRequest;
@Rule
- public final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
- .withExposedPorts(25)
- .withAffinityToContainer()
- .waitingFor(new HostPortWaitStrategy());
-
+ public final FakeSmtp fakeSmtp = new FakeSmtp();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
@@ -107,13 +97,13 @@ public class GroupMappingTest {
.addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(All.class)
- .addProperty("gateway", fakeSmtp.getContainerIp())));
+ .addProperty("gateway", fakeSmtp.getContainer().getContainerIp())));
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
+ fakeSmtp.awaitStarted(awaitOneMinute);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DOMAIN1);
@@ -441,23 +431,9 @@ public class GroupMappingTest {
.recipient(GROUP_ON_DOMAIN1))
.awaitSent(awaitOneMinute);
- calmlyAwait.atMost(1, TimeUnit.MINUTES)
- .until(() -> {
- try {
- with()
- .baseUri("http://" + fakeSmtp.getContainerIp())
- .port(80)
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("[0].from", equalTo(SENDER))
- .body("[0].to[0]", equalTo(externalMail))
- .body("[0].text", equalTo(MESSAGE_CONTENT));
-
- return true;
- } catch(AssertionError e) {
- return false;
- }
- });
+ fakeSmtp.isReceived(response -> response
+ .body("[0].from", equalTo(SENDER))
+ .body("[0].to[0]", equalTo(externalMail))
+ .body("[0].text", equalTo(MESSAGE_CONTENT)));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
index dda4ddd..eb1c812 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
@@ -19,6 +19,7 @@
package org.apache.james.jmap;
+import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.hamcrest.Matchers.equalTo;
import java.util.concurrent.TimeUnit;
@@ -32,21 +33,17 @@ import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.store.probe.MailboxProbe;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
-import org.apache.james.util.docker.Images;
-import org.apache.james.util.docker.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.utils.FakeSmtpHelper;
+import org.apache.james.utils.FakeSmtp;
import org.apache.james.utils.JmapGuiceProbe;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.testcontainers.containers.wait.HostPortWaitStrategy;
import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
-import com.jayway.restassured.RestAssured;
public abstract class VacationRelayIntegrationTest {
@@ -58,12 +55,9 @@ public abstract class VacationRelayIntegrationTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int SMTP_PORT = 1025;
- private static final int REST_SMTP_SINK_PORT = 25;
@Rule
- public final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(Images.FAKE_SMTP)
- .withExposedPorts(REST_SMTP_SINK_PORT)
- .waitingFor(new HostPortWaitStrategy());
+ public FakeSmtp fakeSmtp = new FakeSmtp();
private ConditionFactory calmlyAwait;
@@ -79,7 +73,7 @@ public abstract class VacationRelayIntegrationTest {
@Before
public void setUp() throws Exception {
getInMemoryDns()
- .registerMxRecord("yopmail.com", fakeSmtp.getContainerIp());
+ .registerMxRecord("yopmail.com", fakeSmtp.getContainer().getContainerIp());
guiceJamesServer = getJmapServer();
guiceJamesServer.start();
@@ -94,8 +88,6 @@ public abstract class VacationRelayIntegrationTest {
jmapGuiceProbe = guiceJamesServer.getProbe(JmapGuiceProbe.class);
- RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
-
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility
.with()
@@ -103,7 +95,7 @@ public abstract class VacationRelayIntegrationTest {
.and()
.pollDelay(slowPacedPollInterval).await();
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> fakeSmtp.tryConnect(25));
+ fakeSmtp.awaitStarted(calmlyAwait.atMost(ONE_MINUTE));
}
@After
@@ -130,7 +122,7 @@ public abstract class VacationRelayIntegrationTest {
calmlyAwait.atMost(1, TimeUnit.MINUTES)
.until(() ->
- FakeSmtpHelper.isReceived(response -> response
+ fakeSmtp.isReceived(response -> response
.body("[0].from", equalTo(USER_WITH_DOMAIN))
.body("[0].to[0]", equalTo(externalMail))
.body("[0].text", equalTo(REASON))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index f989249..c8db6e3 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -41,6 +41,11 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
@@ -70,6 +75,10 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
new file mode 100644
index 0000000..b84ac9f
--- /dev/null
+++ b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
@@ -0,0 +1,91 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.utils;
+
+import static com.jayway.restassured.RestAssured.given;
+import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
+import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+
+import java.util.function.Function;
+
+import org.apache.james.util.docker.Images;
+import org.apache.james.util.docker.SwarmGenericContainer;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+import org.testcontainers.containers.wait.HostPortWaitStrategy;
+
+import com.google.common.base.Charsets;
+import com.jayway.awaitility.core.ConditionFactory;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.response.ValidatableResponse;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
+
+public class FakeSmtp implements TestRule {
+ private static final int SMTP_PORT = 25;
+ private static final ResponseSpecification RESPONSE_SPECIFICATION = new ResponseSpecBuilder().build();
+ private final SwarmGenericContainer container;
+
+ public FakeSmtp() {
+ container = new SwarmGenericContainer(Images.FAKE_SMTP)
+ .withExposedPorts(SMTP_PORT)
+ .withAffinityToContainer()
+ .waitingFor(new HostPortWaitStrategy());
+ }
+
+ @Override
+ public Statement apply(Statement statement, Description description) {
+ return container.apply(statement, description);
+ }
+
+ public void awaitStarted(ConditionFactory calmyAwait) {
+ calmyAwait.until(() -> container.tryConnect(SMTP_PORT));
+ }
+
+ public boolean isReceived(Function<ValidatableResponse, ValidatableResponse> expectations) {
+ try {
+ expectations.apply(
+ given(requestSpecification(), RESPONSE_SPECIFICATION)
+ .get("/api/email")
+ .then()
+ .statusCode(200));
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ private RequestSpecification requestSpecification() {
+ return new RequestSpecBuilder()
+ .setContentType(ContentType.JSON)
+ .setAccept(ContentType.JSON)
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)))
+ .setPort(80)
+ .setBaseUri("http://" + container.getContainerIp())
+ .build();
+ }
+
+ public SwarmGenericContainer getContainer() {
+ return container;
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d9f9dfb/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java
deleted file mode 100644
index 7129f60..0000000
--- a/server/testing/src/main/java/org/apache/james/utils/FakeSmtpHelper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.utils;
-
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
-
-import java.util.function.Function;
-
-import com.google.common.base.Charsets;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.ValidatableResponse;
-import com.jayway.restassured.specification.RequestSpecification;
-
-public class FakeSmtpHelper {
- public static RequestSpecification requestSpecification(String ip) {
- return new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(Charsets.UTF_8)))
- .setPort(80)
- .setBaseUri("http://" + ip)
- .build();
- }
-
- public static boolean isReceived(Function<ValidatableResponse, ValidatableResponse> expectations) {
- try {
- expectations.apply(when()
- .get("/api/email")
- .then()
- .statusCode(200));
- return true;
- } catch (Exception e) {
- return false;
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[33/44] james-project git commit: JAMES-2267 Spacing between James
creation and provisioning
Posted by bt...@apache.org.
JAMES-2267 Spacing between James creation and provisioning
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c20d4342
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c20d4342
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c20d4342
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: c20d4342882a5eb53d29f754fe5379115d63601f
Parents: 8f082d3
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 09:47:34 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/james/mailets/BounceIntegrationTest.java | 2 +-
.../org/apache/james/mailets/CommonMailetConfigurationTest.java | 1 +
.../james/mailets/GatewayRemoteDeliveryIntegrationTest.java | 4 ++--
.../james/mailets/RecipientRewriteTableIntegrationTest.java | 2 +-
.../java/org/apache/james/mailets/SmtpAuthIntegrationTest.java | 3 ++-
.../org/apache/james/transport/mailets/ContactExtractorTest.java | 1 +
6 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c20d4342/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index f3fd032..6b67274 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
@@ -233,8 +233,8 @@ public class BounceIntegrationTest {
.mailet(NotifyPostmaster.class)
.addProperty("passThrough", "false")))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(POSTMASTER, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c20d4342/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 92d4fb3..cb6a182 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -51,6 +51,7 @@ public class CommonMailetConfigurationTest {
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
+
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c20d4342/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index afb5546..714264b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -176,8 +176,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
@@ -199,8 +199,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
.build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c20d4342/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index 01fb9bd..e59342a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -60,8 +60,8 @@ public class RecipientRewriteTableIntegrationTest {
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
- dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addDomain(JAMES_ANOTHER_DOMAIN);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c20d4342/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 bd0ebca..64b5d93 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
@@ -87,10 +87,11 @@ public class SmtpAuthIntegrationTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
+
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
+ repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
}
private ProcessorConfiguration deliverOnlyTransport() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c20d4342/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 8afe671..822a7ce 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
@@ -105,6 +105,7 @@ public class ContactExtractorTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailets)
.build(folder);
+
DataProbeImpl probe = jamesServer.getProbe(DataProbeImpl.class);
probe.addDomain(DEFAULT_DOMAIN);
probe.addUser(SENDER, PASSWORD);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[43/44] james-project git commit: JAMES-2262 Improve composability:
allow adding all mailets from a processor
Posted by bt...@apache.org.
JAMES-2262 Improve composability: allow adding all mailets from a processor
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b5efd2f0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b5efd2f0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b5efd2f0
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: b5efd2f011c2618a13981a24be8736716fc31aa9
Parents: ea5cf6f
Author: benwa <bt...@linagora.com>
Authored: Mon Dec 25 10:25:02 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:39 2018 +0700
----------------------------------------------------------------------
.../james/mailets/GatewayRemoteDeliveryIntegrationTest.java | 3 +--
.../org/apache/james/mailets/SmtpAuthIntegrationTest.java | 5 ++---
.../james/mailets/configuration/ProcessorConfiguration.java | 9 +++++++++
.../org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 4 ++--
.../james/transport/mailets/AmqpForwardAttachmentTest.java | 4 ++--
.../james/transport/mailets/ContactExtractorTest.java | 4 ++--
.../apache/james/transport/mailets/GroupMappingTest.java | 4 ++--
.../james/transport/mailets/ICSAttachmentWorkflowTest.java | 4 ++--
.../apache/james/transport/mailets/StripAttachmentTest.java | 4 ++--
server/protocols/jmap-integration-testing/pom.xml | 1 -
10 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 0c30246..ff55d89 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -289,8 +289,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
private ProcessorConfiguration.Builder relayAndLocalDeliveryTransport(String gatewayProperty) {
return ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY)
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.addProperty("gateway", gatewayProperty)
.matcher(All.class));
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/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 7e82e39..a47e393 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
@@ -63,13 +63,12 @@ public class SmtpAuthIntegrationTest {
@Before
public void setup() throws Exception {
- ProcessorConfiguration rootProcessor = ProcessorConfiguration.root()
+ ProcessorConfiguration.Builder rootProcessor = ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(ToProcessor.class)
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
- .addMailet(MailetConfiguration.TO_BOUNCE)
- .build();
+ .addMailet(MailetConfiguration.TO_BOUNCE);
MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(rootProcessor)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
index 8f207fa..d214f66 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
@@ -83,6 +83,15 @@ public class ProcessorConfiguration implements SerializableAsXml {
return this;
}
+ public Builder addMailetsFrom(ProcessorConfiguration processorConfiguration) {
+ this.mailets.addAll(processorConfiguration.mailets);
+ return this;
+ }
+
+ public Builder addMailetsFrom(ProcessorConfiguration.Builder processorConfiguration) {
+ return this.addMailetsFrom(processorConfiguration.build());
+ }
+
public Builder addMailet(MailetConfiguration.Builder mailetConfiguration) {
this.mailets.add(mailetConfiguration.build());
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/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 d7c86ff..81b3b1c 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
@@ -30,6 +30,7 @@ import static org.hamcrest.Matchers.hasSize;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -84,8 +85,7 @@ public class SmtpAuthorizedAddressesTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY)
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(SMTPIsAuthNetwork.class)
.addProperty("gateway", fakeSmtp.getContainerIp()))
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/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 9e84419..6bf3f33 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
@@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -80,7 +81,6 @@ public class AmqpForwardAttachmentTest {
public void setup() throws Exception {
MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
@@ -97,7 +97,7 @@ public class AmqpForwardAttachmentTest {
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE_NAME)
.addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
.addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY))
- .addMailet(MailetConfiguration.LOCAL_DELIVERY));
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport()));
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/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 44b85dc..aba1652 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
@@ -31,6 +31,7 @@ import java.util.Optional;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -92,8 +93,7 @@ public class ContactExtractorTest {
.addProperty(AmqpForwardAttribute.URI_PARAMETER_NAME, amqpRule.getAmqpUri())
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE)
.addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, attribute))
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY));
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport()));
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/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 6f629dc..123560f 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
@@ -37,6 +37,7 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailbox.model.MailboxConstants;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -97,14 +98,13 @@ public class GroupMappingTest {
public void setup() throws Exception {
MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RecipientRewriteTable.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.LOCAL_DELIVERY)
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(All.class)
.addProperty("gateway", fakeSmtp.getContainerIp())));
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/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 337f34e..1745adc 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
@@ -35,6 +35,7 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.mailet.TextCalendarBodyToAttachment;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -447,7 +448,6 @@ public class ICSAttachmentWorkflowTest {
public void setup() throws Exception {
MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
@@ -482,7 +482,7 @@ public class ICSAttachmentWorkflowTest {
.addProperty("exchange", EXCHANGE_NAME)
.addProperty("attribute", JSON_MAIL_ATTRIBUTE)
.addProperty("routing_key", ROUTING_KEY))
- .addMailet(MailetConfiguration.LOCAL_DELIVERY));
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport()));
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/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 535526b..bd17057 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
@@ -31,6 +31,7 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -64,7 +65,6 @@ public class StripAttachmentTest {
public void setup() throws Exception {
MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
@@ -78,7 +78,7 @@ public class StripAttachmentTest {
.matcher(All.class)
.mailet(RecoverAttachment.class)
.addProperty("attribute", "my.attribute"))
- .addMailet(MailetConfiguration.LOCAL_DELIVERY));
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport()));
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/b5efd2f0/server/protocols/jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml
index ed38f3f..3cfe300 100644
--- a/server/protocols/jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/pom.xml
@@ -35,7 +35,6 @@
<modules>
<module>cassandra-jmap-integration-testing</module>
<module>jmap-integration-testing-common</module>
- <module>memory-jmap-integration-testing</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[22/44] james-project git commit: JAMES-2267 Sender creation is not
needed
Posted by bt...@apache.org.
JAMES-2267 Sender creation is not needed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7354cf04
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7354cf04
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7354cf04
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 7354cf044df7520b3df394d1c0cc85a82be96259
Parents: 578b5f1
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 18:18:10 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../src/test/java/org/apache/james/mailets/SieveDelivery.java | 1 -
.../james/transport/mailets/AmqpForwardAttachmentTest.java | 1 -
.../apache/james/transport/mailets/ContactExtractorTest.java | 5 -----
.../james/transport/mailets/ICSAttachmentWorkflowTest.java | 1 -
.../org/apache/james/transport/mailets/StripAttachmentTest.java | 1 -
5 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7354cf04/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 3364b33..14538a6 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
@@ -60,7 +60,6 @@ public class SieveDelivery {
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/7354cf04/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 2db87c7..3e5ce99 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
@@ -116,7 +116,6 @@ public class AmqpForwardAttachmentTest {
DataProbe dataprobe = jamesServer.getProbe(DataProbeImpl.class);
dataprobe.addDomain(DEFAULT_DOMAIN);
- dataprobe.addUser(FROM, PASSWORD);
dataprobe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/7354cf04/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 bd4de44..2ef708b 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
@@ -110,11 +110,6 @@ public class ContactExtractorTest {
probe.addDomain(DEFAULT_DOMAIN);
probe.addUser(SENDER, PASSWORD);
probe.addUser(TO, PASSWORD);
- probe.addUser(TO2, PASSWORD);
- probe.addUser(CC, PASSWORD);
- probe.addUser(CC2, PASSWORD);
- probe.addUser(BCC, PASSWORD);
- probe.addUser(BCC2, PASSWORD);
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/7354cf04/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 76640b2..59d4a37 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
@@ -501,7 +501,6 @@ public class ICSAttachmentWorkflowTest {
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
http://git-wip-us.apache.org/repos/asf/james-project/blob/7354cf04/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 b902e9f..dd99994 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
@@ -97,7 +97,6 @@ public class StripAttachmentTest {
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
- dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[05/44] james-project git commit: JAMES-2267 MimeMessageBuilder:
solve some IntelliJ warnings
Posted by bt...@apache.org.
JAMES-2267 MimeMessageBuilder: solve some IntelliJ warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b860c64c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b860c64c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b860c64c
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: b860c64cd5f3b07cecacb5d53f0c524617abc33b
Parents: 0df7c31
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 10:18:01 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:50 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/mailet/base/test/MimeMessageBuilder.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b860c64c/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
index f5a5caf..b2b0794 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java
@@ -283,22 +283,21 @@ public class MimeMessageBuilder {
}
public MimeMessageBuilder addToRecipient(String... tos) throws AddressException {
- this.to.addAll(Arrays.asList(tos).stream()
+ this.to.addAll(Arrays.stream(tos)
.map(TO_INTERNET_ADDRESS)
.collect(Guavate.toImmutableList()));
return this;
}
public MimeMessageBuilder addCcRecipient(String... ccs) throws AddressException {
- this.cc.addAll(Arrays.asList(ccs).stream()
+ this.cc.addAll(Arrays.stream(ccs)
.map(TO_INTERNET_ADDRESS)
.collect(Guavate.toImmutableList()));
return this;
}
public MimeMessageBuilder addBccRecipient(String... bccs) throws AddressException {
- this.bcc.addAll(Arrays.asList(bccs)
- .stream()
+ this.bcc.addAll(Arrays.stream(bccs)
.map(TO_INTERNET_ADDRESS)
.collect(Guavate.toImmutableList()));
return this;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[15/44] james-project git commit: JAMES-2267 Factorize mailet
integration common constants
Posted by bt...@apache.org.
JAMES-2267 Factorize mailet integration common constants
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9e639adb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9e639adb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9e639adb
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 9e639adb227a4b4603b6586409455d4cb6e68a48
Parents: 456972f
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 16:09:39 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../james/mailets/AddDeliveredToHeaderTest.java | 14 +-
.../james/mailets/BounceIntegrationTest.java | 55 ++--
.../mailets/CommonMailetConfigurationTest.java | 14 +-
.../GatewayRemoteDeliveryIntegrationTest.java | 55 ++--
.../mailets/NetworkMatcherIntegrationTest.java | 183 ++++++-----
.../RecipientRewriteTableIntegrationTest.java | 49 ++-
.../org/apache/james/mailets/SieveDelivery.java | 40 +--
.../james/mailets/SmtpAuthIntegrationTest.java | 21 +-
.../james/mailets/configuration/AwaitUtils.java | 34 ---
.../james/mailets/configuration/Constants.java | 40 +++
.../crypto/SMIMEDecryptIntegrationTest.java | 9 +-
.../crypto/SMIMESignIntegrationTest.java | 57 ++--
.../james/smtp/SmtpAuthorizedAddressesTest.java | 25 +-
.../james/smtp/SmtpBracketEnforcementTest.java | 23 +-
.../smtp/SmtpIdentityVerificationTest.java | 22 +-
.../james/smtp/SmtpSizeLimitationTest.java | 19 +-
.../mailets/AmqpForwardAttachmentTest.java | 23 +-
.../transport/mailets/ContactExtractorTest.java | 31 +-
.../transport/mailets/GroupMappingTest.java | 300 +++++++++----------
.../mailets/ICSAttachmentWorkflowTest.java | 41 ++-
.../transport/mailets/StripAttachmentTest.java | 23 +-
21 files changed, 518 insertions(+), 560 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index 4464056..bd47efb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -20,7 +20,12 @@
package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -37,13 +42,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class AddDeliveredToHeaderTest {
-
- private static final String DEFAULT_DOMAIN = "james.org";
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index b00b57e..b23082f 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
@@ -20,7 +20,12 @@
package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -48,15 +53,9 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class BounceIntegrationTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final int IMAP_PORT = 1143;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
- public static final String POSTMASTER = "postmaster@" + JAMES_APACHE_ORG;
- public static final String BOUNCE_RECEIVER = "bounce.receiver@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "to@" + JAMES_APACHE_ORG;
+ public static final String POSTMASTER = "postmaster@" + DEFAULT_DOMAIN;
+ public static final String BOUNCE_RECEIVER = "bounce.receiver@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT = "to@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -83,11 +82,11 @@ public class BounceIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -109,11 +108,11 @@ public class BounceIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -135,12 +134,12 @@ public class BounceIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
+ messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
@@ -162,12 +161,12 @@ public class BounceIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
+ messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
@@ -189,12 +188,12 @@ public class BounceIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
+ messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(BOUNCE_RECEIVER, PASSWORD)
@@ -215,11 +214,11 @@ public class BounceIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(BOUNCE_RECEIVER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(BOUNCE_RECEIVER, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -241,12 +240,12 @@ public class BounceIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
dataProbe.addUser(POSTMASTER, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
- messageSender.sendMessage("any@" + JAMES_APACHE_ORG, RECIPIENT);
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
+ messageSender.sendMessage("any@" + DEFAULT_DOMAIN, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(POSTMASTER, PASSWORD)
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 1a7e217..2b61ade 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -20,7 +20,12 @@
package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
@@ -35,13 +40,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class CommonMailetConfigurationTest {
-
- private static final String DEFAULT_DOMAIN = "james.org";
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 0dbb573..75dc866 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -25,7 +25,12 @@ import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.MemoryJamesServerMain.SMTP_AND_IMAP_MODULE;
import static org.apache.james.MemoryJamesServerMain.SMTP_ONLY_MODULE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+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.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -64,15 +69,9 @@ import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
public class GatewayRemoteDeliveryIntegrationTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final int IMAP_PORT = 1143;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
private static final String JAMES_ANOTHER_DOMAIN = "james.com";
- private static final String FROM = "from@" + JAMES_APACHE_ORG;
+ private static final String FROM = "from@" + DEFAULT_DOMAIN;
private static final String RECIPIENT = "touser@" + JAMES_ANOTHER_DOMAIN;
@Rule
@@ -122,10 +121,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
@@ -142,10 +141,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
@@ -162,10 +161,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
@@ -182,10 +181,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
@@ -206,10 +205,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
Thread.sleep(TimeUnit.SECONDS.toMillis(5));
@@ -231,7 +230,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
+ .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
@@ -239,10 +238,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -263,7 +262,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
+ .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
@@ -288,10 +287,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
@@ -311,7 +310,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
+ .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(directResolutionTransport())
@@ -319,10 +318,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT);
calmlyAwait.atMost(ONE_MINUTE).until(this::messageIsReceivedByTheSmtpServer);
@@ -346,7 +345,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
private MailetContainer generateMailetContainerConfiguration(String gatewayProperty) {
return MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
+ .postmaster("postmaster@" + DEFAULT_DOMAIN)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(relayOnlyTransport(gatewayProperty))
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index eba6574..f02ab31 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -20,7 +20,12 @@
package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.MemoryJamesServerMain;
@@ -45,19 +50,15 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class NetworkMatcherIntegrationTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final int IMAP_PORT = 1143;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
- private static final String FROM = "fromuser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromuser@" + DEFAULT_DOMAIN;
private static final String DROPPED_MAILS = "file://var/mail/dropped-mails/";
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
@@ -71,7 +72,7 @@ public class NetworkMatcherIntegrationTest {
.build(temporaryFolder);
DataProbe dataProbe = temporaryJamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
return temporaryJamesServer;
}
@@ -107,17 +108,15 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -130,17 +129,15 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -153,17 +150,15 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -176,17 +171,15 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -199,17 +192,15 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -222,17 +213,15 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -245,21 +234,19 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
- assertThat(
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .hasAMessage())
- .isFalse();
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ assertThat(
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .hasAMessage())
+ .isFalse();
}
@Test
@@ -272,21 +259,19 @@ public class NetworkMatcherIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(toRepository()));
- try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
-
- messageSender.sendMessage(FROM, FROM)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
- calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
- assertThat(
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(FROM, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .hasAMessage())
- .isFalse();
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, FROM)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ MailRepositoryProbeImpl repositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
+ calmlyAwait.atMost(ONE_MINUTE).until(() -> repositoryProbe.getRepositoryMailCount(DROPPED_MAILS) == 1);
+ assertThat(
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(FROM, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .hasAMessage())
+ .isFalse();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index 58b69e3..decf799 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -20,7 +20,12 @@
package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.modules.MailboxProbeImpl;
@@ -35,19 +40,13 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class RecipientRewriteTableIntegrationTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
private static final String JAMES_ANOTHER_DOMAIN = "james.com";
- private static final String FROM = "fromUser@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
- private static final String ANY_AT_JAMES = "any@" + JAMES_APACHE_ORG;
- private static final String OTHER_AT_JAMES = "other@" + JAMES_APACHE_ORG;
+ private static final String ANY_AT_JAMES = "any@" + DEFAULT_DOMAIN;
+ private static final String OTHER_AT_JAMES = "other@" + DEFAULT_DOMAIN;
private static final String ANY_AT_ANOTHER_DOMAIN = "any@" + JAMES_ANOTHER_DOMAIN;
@@ -65,7 +64,7 @@ public class RecipientRewriteTableIntegrationTest {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addDomain(JAMES_ANOTHER_DOMAIN);
}
@@ -81,10 +80,10 @@ public class RecipientRewriteTableIntegrationTest {
createUserInbox(ANY_AT_JAMES);
createUserInbox(OTHER_AT_JAMES);
- dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, ANY_AT_JAMES);
- dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES);
+ dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
+ dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -107,10 +106,10 @@ public class RecipientRewriteTableIntegrationTest {
createUserInbox(ANY_AT_JAMES);
createUserInbox(OTHER_AT_JAMES);
- dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, ANY_AT_JAMES);
- dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES);
+ dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
+ dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -131,10 +130,10 @@ public class RecipientRewriteTableIntegrationTest {
createUserInbox(localUser);
createUserInbox(OTHER_AT_JAMES);
- dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, nonDomainUser);
- dataProbe.addAddressMapping("touser", JAMES_APACHE_ORG, OTHER_AT_JAMES);
+ dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, nonDomainUser);
+ dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, RECIPIENT)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -151,12 +150,12 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void messageShouldRedirectToTheSameUserWhenDomainMapping() throws Exception {
- dataProbe.addDomainAliasMapping(JAMES_APACHE_ORG, JAMES_ANOTHER_DOMAIN);
+ dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
createUserInbox(ANY_AT_JAMES);
createUserInbox(ANY_AT_ANOTHER_DOMAIN);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, ANY_AT_JAMES)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -169,12 +168,12 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void messageShouldNotSendToRecipientWhenDomainMapping() throws Exception {
- dataProbe.addDomainAliasMapping(JAMES_APACHE_ORG, JAMES_ANOTHER_DOMAIN);
+ dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
createUserInbox(ANY_AT_JAMES);
createUserInbox(ANY_AT_ANOTHER_DOMAIN);
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, ANY_AT_JAMES)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 40666af..3d5fc03 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
@@ -20,7 +20,12 @@
package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.store.probe.MailboxProbe;
@@ -37,43 +42,42 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class SieveDelivery {
-
- private static final String DEFAULT_DOMAIN = "james.org";
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
+ private String targetedMailbox;
+ private String recipient;
+ private String from;
@Before
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
- }
- @After
- public void tearDown() {
- jamesServer.shutdown();
- }
- @Test
- public void simpleMailShouldBeSent() throws Exception {
- String from = "user@" + DEFAULT_DOMAIN;
- String recipient = "user2@" + DEFAULT_DOMAIN;
- String targetedMailbox = "INBOX.any";
+ from = "user@" + DEFAULT_DOMAIN;
+ recipient = "user2@" + DEFAULT_DOMAIN;
+ targetedMailbox = "INBOX.any";
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(from, PASSWORD);
dataProbe.addUser(recipient, PASSWORD);
+
MailboxProbe mailboxProbe = jamesServer.getProbe(MailboxProbeImpl.class);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipient, "INBOX");
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipient, targetedMailbox);
+ }
+
+ @After
+ public void tearDown() {
+ jamesServer.shutdown();
+ }
+
+ @Test
+ public void simpleMailShouldBeSent() throws Exception {
jamesServer.getProbe(SieveProbeImpl.class).addActiveSieveScript(recipient, "myscript.sieve", "require \"fileinto\";\n" +
"\n" +
"fileinto \"" + targetedMailbox + "\";");
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 53e96e5..68385ae 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,7 +20,12 @@
package org.apache.james.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.MemoryJamesServerMain;
@@ -45,13 +50,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class SmtpAuthIntegrationTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final int IMAP_PORT = 1143;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
- private static final String FROM = "fromuser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromuser@" + DEFAULT_DOMAIN;
private static final String DROPPED_MAILS = "file://var/mail/dropped-mails/";
@Rule
@@ -87,7 +86,7 @@ public class SmtpAuthIntegrationTest {
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
}
@@ -119,7 +118,7 @@ public class SmtpAuthIntegrationTest {
@Test
public void authenticatedSmtpSessionsShouldBeDelivered() throws Exception {
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -134,7 +133,7 @@ public class SmtpAuthIntegrationTest {
@Test
public void nonAuthenticatedSmtpSessionsShouldNotBeDelivered() throws Exception {
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java
deleted file mode 100644
index 6ecbaa8..0000000
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/AwaitUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mailets.configuration;
-
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
-
-public class AwaitUtils {
- public static Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- public static ConditionFactory calmlyAwait = Awaitility.with()
- .pollInterval(slowPacedPollInterval)
- .and()
- .with()
- .pollDelay(slowPacedPollInterval)
- .await();
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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
new file mode 100644
index 0000000..0d2bd72
--- /dev/null
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java
@@ -0,0 +1,40 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.mailets.configuration;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.Duration;
+import com.jayway.awaitility.core.ConditionFactory;
+
+public class Constants {
+ public static Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
+ public static ConditionFactory calmlyAwait = Awaitility.with()
+ .pollInterval(slowPacedPollInterval)
+ .and()
+ .with()
+ .pollDelay(slowPacedPollInterval)
+ .await();
+
+ 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";
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 c95a095..16e9ccc 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,10 @@
package org.apache.james.mailets.crypto;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -51,11 +54,7 @@ import org.junit.rules.TemporaryFolder;
public class SMIMEDecryptIntegrationTest {
private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
private static final int SMTP_SECURE_PORT = 10465;
-
- private static final String DEFAULT_DOMAIN = "localdomain";
private static final String FROM = "sender@" + DEFAULT_DOMAIN;
private static final String PASSWORD = "secret";
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 366513d..d13c5ac 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,11 @@
package org.apache.james.mailets.crypto;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.time.ZonedDateTime;
@@ -53,17 +57,14 @@ import org.junit.rules.TemporaryFolder;
public class SMIMESignIntegrationTest {
private static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
- private static final String DEFAULT_DOMAIN = "domain";
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
private static final int SMTP_SECURE_PORT = 10465;
- private static final String PASSWORD = "secret";
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private TemporaryJamesServer jamesServer;
public static final String FROM = "user@" + DEFAULT_DOMAIN;
@@ -120,33 +121,31 @@ public class SMIMESignIntegrationTest {
@Test
public void authenticatedMessagesShouldBeSigned() throws Exception {
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_SECURE_PORT, DEFAULT_DOMAIN, FROM, PASSWORD);) {
- messageSender.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
- assertThat(imapMessageReader.readFirstMessage())
- .containsSequence("Content-Description: S/MIME Cryptographic Signature");
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
+ .authenticate(FROM, PASSWORD)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ assertThat(imapMessageReader.readFirstMessage())
+ .containsSequence("Content-Description: S/MIME Cryptographic Signature");
}
@Test
public void NonAuthenticatedMessagesShouldNotBeSigned() throws Exception {
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
- messageSender.sendMessage(FROM, RECIPIENT)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(RECIPIENT, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
- assertThat(imapMessageReader.readFirstMessage())
- .doesNotContain("Content-Description: S/MIME Cryptographic Signature");
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_SECURE_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ assertThat(imapMessageReader.readFirstMessage())
+ .doesNotContain("Content-Description: S/MIME Cryptographic Signature");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 f09218a..489ee06 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
@@ -23,7 +23,12 @@ import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.when;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+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.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -60,13 +65,7 @@ import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
public class SmtpAuthorizedAddressesTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- public static final int IMAP_PORT = 1143;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
- private static final String FROM = "fromuser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromuser@" + DEFAULT_DOMAIN;
private static final String TO = "to@any.com";
private final TemporaryFolder smtpFolder = new TemporaryFolder();
@@ -137,7 +136,7 @@ public class SmtpAuthorizedAddressesTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
}
@@ -155,7 +154,7 @@ public class SmtpAuthorizedAddressesTest {
.withAutorizedAddresses("127.0.0.0/8"));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, TO)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -172,7 +171,7 @@ public class SmtpAuthorizedAddressesTest {
.withAutorizedAddresses("172.0.0.0/8"));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(FROM, TO);
calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
@@ -186,7 +185,7 @@ public class SmtpAuthorizedAddressesTest {
.withAutorizedAddresses("172.0.0.0/8"));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, FROM, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, FROM, PASSWORD)) {
messageSender.sendMessage(FROM, TO)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -203,7 +202,7 @@ public class SmtpAuthorizedAddressesTest {
.withAutorizedAddresses("172.0.0.0/8"));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(TO, FROM)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 6c9726b..0dc6295 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
@@ -20,7 +20,11 @@
package org.apache.james.smtp;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+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.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -42,12 +46,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class SmtpBracketEnforcementTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
- private static final String USER = "user@" + JAMES_APACHE_ORG;
+ private static final String USER = "user@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -82,7 +81,7 @@ public class SmtpBracketEnforcementTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(USER, PASSWORD);
}
@@ -99,7 +98,7 @@ public class SmtpBracketEnforcementTest {
.doNotRequireBracketEnforcement());
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
messageSender.sendMessage(USER, USER)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -112,7 +111,7 @@ public class SmtpBracketEnforcementTest {
.doNotRequireBracketEnforcement());
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
messageSender.sendMessageNoBracket(USER, USER)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -125,7 +124,7 @@ public class SmtpBracketEnforcementTest {
.requireBracketEnforcement());
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
messageSender.sendMessage(USER, USER)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -138,7 +137,7 @@ public class SmtpBracketEnforcementTest {
.requireBracketEnforcement());
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
messageSender.sendMessageNoBracket(USER, USER);
calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 58a7c05..f56a476 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
@@ -20,7 +20,11 @@
package org.apache.james.smtp;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+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.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -42,14 +46,10 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class SmtpIdentityVerificationTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
private static final String ATTACKER_PASSWORD = "secret";
- private static final String JAMES_APACHE_ORG = "james.org";
- private static final String ATTACKER = "attacker@" + JAMES_APACHE_ORG;
- private static final String USER = "user@" + JAMES_APACHE_ORG;
+ private static final String ATTACKER = "attacker@" + DEFAULT_DOMAIN;
+ private static final String USER = "user@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -80,7 +80,7 @@ public class SmtpIdentityVerificationTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(USER, PASSWORD);
dataProbe.addUser(ATTACKER, ATTACKER_PASSWORD);
}
@@ -99,7 +99,7 @@ public class SmtpIdentityVerificationTest {
.verifyIdentity());
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
messageSender.sendMessage(USER, USER)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -113,7 +113,7 @@ public class SmtpIdentityVerificationTest {
.doNotVerifyIdentity());
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, ATTACKER, ATTACKER_PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, ATTACKER, ATTACKER_PASSWORD)) {
messageSender.sendMessage(USER, USER)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -127,7 +127,7 @@ public class SmtpIdentityVerificationTest {
.verifyIdentity());
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, ATTACKER, ATTACKER_PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, ATTACKER, ATTACKER_PASSWORD)) {
messageSender.sendMessage(USER, USER);
calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 4bedf38..0716d4e 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
@@ -20,7 +20,11 @@
package org.apache.james.smtp;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+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.calmlyAwait;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -44,12 +48,7 @@ import org.junit.rules.TemporaryFolder;
import com.google.common.base.Strings;
public class SmtpSizeLimitationTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
- private static final String USER = "user@" + JAMES_APACHE_ORG;
+ private static final String USER = "user@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -84,7 +83,7 @@ public class SmtpSizeLimitationTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(USER, PASSWORD);
}
@@ -102,7 +101,7 @@ public class SmtpSizeLimitationTest {
.withMaxMessageSizeInKb(10));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
messageSender.sendMessageWithHeaders(USER, USER, Strings.repeat("Long message", 1024));
calmlyAwait.atMost(ONE_MINUTE).until(messageSender::messageSendingFailed);
@@ -116,7 +115,7 @@ public class SmtpSizeLimitationTest {
.withMaxMessageSizeInKb(10));
try (SMTPMessageSender messageSender =
- SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG, USER, PASSWORD)) {
+ SMTPMessageSender.authentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN, USER, PASSWORD)) {
messageSender.sendMessageWithHeaders(USER, USER,"Short message")
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 6218137..34ff43d 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,7 +20,12 @@
package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -54,16 +59,8 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
public class AmqpForwardAttachmentTest {
-
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
-
- private static final String FROM = "fromUser@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
private static final String MAIL_ATTRIBUTE = "my.attribute";
private static final String EXCHANGE_NAME = "myExchange";
@@ -118,7 +115,7 @@ public class AmqpForwardAttachmentTest {
.build(temporaryFolder);
DataProbe dataprobe = jamesServer.getProbe(DataProbeImpl.class);
- dataprobe.addDomain(JAMES_APACHE_ORG);
+ dataprobe.addDomain(DEFAULT_DOMAIN);
dataprobe.addUser(FROM, PASSWORD);
dataprobe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
@@ -147,7 +144,7 @@ public class AmqpForwardAttachmentTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 164fae9..52379cd 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,7 +20,13 @@ package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
+import static org.apache.mailet.base.MailAddressFixture.JAMES_APACHE_ORG;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
@@ -51,20 +57,13 @@ import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
public class ContactExtractorTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String JAMES_APACHE_ORG = "james.org";
-
- public static final String JAMES_ORG = "james.org";
- public static final String SENDER = "sender@" + JAMES_ORG;
- public static final String TO = "to@" + JAMES_ORG;
- public static final String TO2 = "to2@" + JAMES_ORG;
- public static final String CC = "cc@" + JAMES_ORG;
- public static final String CC2 = "cc2@" + JAMES_ORG;
- public static final String BCC = "bcc@" + JAMES_ORG;
- public static final String BCC2 = "bcc2@" + JAMES_ORG;
- public static final String PASSWORD = "secret";
+ public static final String SENDER = "sender@" + DEFAULT_DOMAIN;
+ public static final String TO = "to@" + DEFAULT_DOMAIN;
+ public static final String TO2 = "to2@" + DEFAULT_DOMAIN;
+ public static final String CC = "cc@" + DEFAULT_DOMAIN;
+ public static final String CC2 = "cc2@" + DEFAULT_DOMAIN;
+ public static final String BCC = "bcc@" + DEFAULT_DOMAIN;
+ public static final String BCC2 = "bcc2@" + DEFAULT_DOMAIN;
public static final String EXCHANGE = "collector:email";
public static final String ROUTING_KEY = "";
@@ -108,7 +107,7 @@ public class ContactExtractorTest {
.withMailetContainer(mailets)
.build(folder);
DataProbeImpl probe = jamesServer.getProbe(DataProbeImpl.class);
- probe.addDomain(JAMES_ORG);
+ probe.addDomain(DEFAULT_DOMAIN);
probe.addUser(SENDER, PASSWORD);
probe.addUser(TO, PASSWORD);
probe.addUser(TO2, PASSWORD);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[44/44] james-project git commit: JAMES-2266 Rebase AddFooter
integration test
Posted by bt...@apache.org.
JAMES-2266 Rebase AddFooter integration test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/55dc6ff9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/55dc6ff9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/55dc6ff9
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 55dc6ff94fbc6e8ce1255455002c52b65a40710e
Parents: 4a34bf2
Author: benwa <bt...@linagora.com>
Authored: Thu Jan 4 09:51:43 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:35:04 2018 +0700
----------------------------------------------------------------------
.../james/mailets/BounceIntegrationTest.java | 6 +-
.../GatewayRemoteDeliveryIntegrationTest.java | 12 +-
.../apache/james/mailets/MailetErrorsTest.java | 88 +++++------
.../mailets/NetworkMatcherIntegrationTest.java | 6 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 8 +-
.../james/mailets/TemporaryJamesServer.java | 32 ++--
.../mailets/configuration/MailetContainer.java | 6 +-
.../crypto/SMIMEDecryptIntegrationTest.java | 6 +-
.../crypto/SMIMESignIntegrationTest.java | 16 +-
.../james/smtp/SmtpAuthorizedAddressesTest.java | 2 +-
.../james/transport/mailets/AddFooterTest.java | 157 +++++++------------
.../mailets/AmqpForwardAttachmentTest.java | 4 +-
.../transport/mailets/ContactExtractorTest.java | 4 +-
.../transport/mailets/GroupMappingTest.java | 2 +-
.../mailets/ICSAttachmentWorkflowTest.java | 4 +-
.../transport/mailets/SpamAssassinTest.java | 4 +-
.../transport/mailets/StripAttachmentTest.java | 4 +-
17 files changed, 159 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 910af99..120f5d3 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
@@ -247,10 +247,10 @@ public class BounceIntegrationTest {
}
private MailetContainer.Builder generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
- return TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
+ return TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
.postmaster(POSTMASTER)
- .addProcessor(transport())
- .addProcessor(bounces(redirectionMailetConfiguration));
+ .putProcessor(transport())
+ .putProcessor(bounces(redirectionMailetConfiguration));
}
private ProcessorConfiguration.Builder transport() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 2eb4c77..5e780f1 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -216,7 +216,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(ProcessorConfiguration.transport()
+ .putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.remoteDeliveryBuilderNoBounces()
@@ -243,10 +243,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.simpleRoot())
- .addProcessor(CommonProcessors.error())
- .addProcessor(directResolutionTransport())
- .addProcessor(CommonProcessors.bounces()))
+ .putProcessor(CommonProcessors.simpleRoot())
+ .putProcessor(CommonProcessors.error())
+ .putProcessor(directResolutionTransport())
+ .putProcessor(CommonProcessors.bounces()))
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
@@ -268,7 +268,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
private MailetContainer.Builder generateMailetContainerConfiguration(String gatewayProperty) {
return TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(relayAndLocalDeliveryTransport(gatewayProperty));
+ .putProcessor(relayAndLocalDeliveryTransport(gatewayProperty));
}
private ProcessorConfiguration.Builder relayAndLocalDeliveryTransport(String gatewayProperty) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
index e912faa..9836af3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
@@ -69,9 +69,9 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ErrorMailet.class))))
@@ -88,9 +88,9 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RuntimeErrorMailet.class))))
@@ -107,10 +107,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ErrorMailet.class)
@@ -129,10 +129,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RuntimeErrorMailet.class)
@@ -150,10 +150,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RuntimeErrorMailet.class)
@@ -175,10 +175,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ErrorMailet.class)
@@ -200,9 +200,9 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(ErrorMatcher.class)
.mailet(NoopMailet.class))))
@@ -219,9 +219,9 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RuntimeErrorMatcher.class)
.mailet(NoopMailet.class))))
@@ -238,10 +238,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(ErrorMatcher.class)
.mailet(NoopMailet.class)
@@ -259,10 +259,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RuntimeErrorMatcher.class)
.mailet(NoopMailet.class)
@@ -280,10 +280,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(RuntimeErrorMatcher.class)
.mailet(Null.class)
@@ -305,10 +305,10 @@ public class MailetErrorsTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(errorProcessor())
- .addProcessor(customProcessor())
- .addProcessor(ProcessorConfiguration.root()
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(errorProcessor())
+ .putProcessor(customProcessor())
+ .putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(ErrorMatcher.class)
.mailet(Null.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 2f87c73..362f5af 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -62,9 +62,9 @@ public class NetworkMatcherIntegrationTest {
private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
TemporaryJamesServer temporaryJamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(rootProcessor)
- .addProcessor(CommonProcessors.deliverOnlyTransport()))
+ .withMailetContainer(TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(rootProcessor)
+ .putProcessor(CommonProcessors.deliverOnlyTransport()))
.build(temporaryFolder);
DataProbe dataProbe = temporaryJamesServer.getProbe(DataProbeImpl.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 a47e393..19a3b5d 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
@@ -70,10 +70,10 @@ public class SmtpAuthIntegrationTest {
.addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
.addMailet(MailetConfiguration.TO_BOUNCE);
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(rootProcessor)
- .addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(bounces());
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(rootProcessor)
+ .putProcessor(CommonProcessors.deliverOnlyTransport())
+ .putProcessor(bounces());
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index 265580c..a621caa 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -49,23 +49,23 @@ import com.google.inject.Module;
public class TemporaryJamesServer {
- public static final MailetContainer.Builder DEFAUL_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(CommonProcessors.transport())
- .addProcessor(CommonProcessors.spam())
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck());
+ public static final MailetContainer.Builder DEFAULT_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
+ .putProcessor(CommonProcessors.root())
+ .putProcessor(CommonProcessors.error())
+ .putProcessor(CommonProcessors.transport())
+ .putProcessor(CommonProcessors.spam())
+ .putProcessor(CommonProcessors.localAddressError())
+ .putProcessor(CommonProcessors.relayDenied())
+ .putProcessor(CommonProcessors.bounces())
+ .putProcessor(CommonProcessors.sieveManagerCheck());
public static final MailetContainer.Builder SIMPLE_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
- .addProcessor(CommonProcessors.simpleRoot())
- .addProcessor(CommonProcessors.error())
- .addProcessor(CommonProcessors.transport())
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces());
+ .putProcessor(CommonProcessors.simpleRoot())
+ .putProcessor(CommonProcessors.error())
+ .putProcessor(CommonProcessors.transport())
+ .putProcessor(CommonProcessors.localAddressError())
+ .putProcessor(CommonProcessors.relayDenied())
+ .putProcessor(CommonProcessors.bounces());
public static class Builder {
private ImmutableList.Builder<Module> overrideModules;
@@ -112,7 +112,7 @@ public class TemporaryJamesServer {
public TemporaryJamesServer build(TemporaryFolder temporaryFolder) throws Exception {
return new TemporaryJamesServer(
temporaryFolder,
- mailetConfiguration.orElse(DEFAUL_MAILET_CONTAINER_CONFIGURATION.build()),
+ mailetConfiguration.orElse(DEFAULT_MAILET_CONTAINER_CONFIGURATION.build()),
smtpConfiguration.orElse(SmtpConfiguration.DEFAULT),
module.orElse(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE),
overrideModules.build());
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
index c9ed6bb..0e2c3db 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -59,13 +59,13 @@ public class MailetContainer implements SerializableAsXml {
return this;
}
- public Builder addProcessor(ProcessorConfiguration processorConfiguration) {
+ public Builder putProcessor(ProcessorConfiguration processorConfiguration) {
this.processors.put(processorConfiguration.getState(), processorConfiguration);
return this;
}
- public Builder addProcessor(ProcessorConfiguration.Builder processorConfiguration) {
- return this.addProcessor(processorConfiguration.build());
+ public Builder putProcessor(ProcessorConfiguration.Builder processorConfiguration) {
+ return this.putProcessor(processorConfiguration.build());
}
public MailetContainer build() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 2d2275d..cb821ef 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
@@ -64,9 +64,9 @@ public class SMIMEDecryptIntegrationTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.transport()
+ .putProcessor(CommonProcessors.root())
+ .putProcessor(CommonProcessors.error())
+ .putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.mailet(SMIMEDecrypt.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 ebf46f8..3870876 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
@@ -68,9 +68,9 @@ public class SMIMESignIntegrationTest {
@Before
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.transport()
+ .putProcessor(CommonProcessors.root())
+ .putProcessor(CommonProcessors.error())
+ .putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(HasMailAttribute.class)
.matcherCondition("org.apache.james.SMIMECheckSignature")
@@ -86,11 +86,11 @@ public class SMIMESignIntegrationTest {
.addProperty("keyStoreType", "PKCS12")
.addProperty("debug", "true"))
.addMailet(MailetConfiguration.LOCAL_DELIVERY))
- .addProcessor(CommonProcessors.spam())
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck())
+ .putProcessor(CommonProcessors.spam())
+ .putProcessor(CommonProcessors.localAddressError())
+ .putProcessor(CommonProcessors.relayDenied())
+ .putProcessor(CommonProcessors.bounces())
+ .putProcessor(CommonProcessors.sieveManagerCheck())
.build();
jamesServer = TemporaryJamesServer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 5fef6bb..db71574 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
@@ -69,7 +69,7 @@ public class SmtpAuthorizedAddressesTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(ProcessorConfiguration.transport()
+ .putProcessor(ProcessorConfiguration.transport()
.addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(SMTPIsAuthNetwork.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 5c43c22..a50e3ed 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
@@ -19,25 +19,26 @@
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.awaitOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
-import javax.mail.internet.MimeMessage;
-
-import org.apache.james.MemoryJamesServerMain;
-import org.apache.james.core.MailAddress;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
import org.apache.james.modules.server.ActiveMQQueueModule;
import org.apache.james.probe.DataProbe;
import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
-import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.After;
@@ -46,65 +47,33 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
-
public class AddFooterTest {
-
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
-
- private static final String FROM = "fromUser@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_APACHE_ORG;
public static final String MATCH_ME = "Match me";
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public SMTPMessageSender smtpMessageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
private TemporaryJamesServer jamesServer;
- private ConditionFactory calmlyAwait;
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
- .addProcessor(ProcessorConfiguration.builder()
- .state("transport")
- .enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(AddFooter.class)
- .addProperty("text", MATCH_ME)
- .build())
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
- .build())
- .build();
-
jamesServer = TemporaryJamesServer.builder()
- .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withOverrides(new ActiveMQQueueModule())
- .build(temporaryFolder, mailetContainer);
- Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
- calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
+ .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(ProcessorConfiguration.transport()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(AddFooter.class)
+ .addProperty("text", MATCH_ME))
+ .addMailetsFrom(CommonProcessors.transport())))
+ .build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(RECIPIENT, PASSWORD);
}
@@ -115,57 +84,45 @@ public class AddFooterTest {
@Test
public void shouldAddFooterWhenSimpleMessage() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
- .setText("Any content")
- .setSubject("test")
- .build();
-
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- String processedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD);
- assertThat(processedMessage).contains(MATCH_ME);
- }
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
+ .setText("Any content")
+ .setSubject("test"))
+ .sender(FROM)
+ .recipient(RECIPIENT))
+ .awaitSent(awaitOneMinute);
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitOneMinute);
+ String processedMessage = imapMessageReader.readFirstMessage();
+ assertThat(processedMessage).contains(MATCH_ME);
}
@Test
public void shouldAddFooterWhenMultipartMessage() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
- .setMultipartWithBodyParts(
- MimeMessageBuilder.bodyPartBuilder()
- .type("text/plain")
- .data("Text message")
- .build(),
- MimeMessageBuilder.bodyPartBuilder()
- .data("IMAGE")
- .type("application/data")
- .build())
- .setSubject("test")
- .build();
-
- Mail mail = FakeMail.builder()
- .mimeMessage(message)
- .sender(new MailAddress(FROM))
- .recipient(new MailAddress(RECIPIENT))
- .build();
-
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG);
- IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST_IP, IMAP_PORT)) {
- messageSender.sendMessage(mail);
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
-
- calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
- String processedMessage = imapMessageReader.readFirstMessageInInbox(RECIPIENT, PASSWORD);
- assertThat(processedMessage).contains(MATCH_ME);
- }
+ smtpMessageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
+ .setMultipartWithBodyParts(
+ MimeMessageBuilder.bodyPartBuilder()
+ .type("text/plain")
+ .data("Text message"),
+ MimeMessageBuilder.bodyPartBuilder()
+ .data("IMAGE")
+ .type("application/data"))
+ .setSubject("test"))
+ .sender(FROM)
+ .recipient(RECIPIENT))
+ .awaitSent(awaitOneMinute);
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(RECIPIENT, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitOneMinute);
+ String processedMessage = imapMessageReader.readFirstMessage();
+ assertThat(processedMessage).contains(MATCH_ME);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 6bf3f33..54d7a79 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -79,8 +79,8 @@ public class AmqpForwardAttachmentTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(ProcessorConfiguration.transport()
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 aba1652..52d7bbc 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
@@ -79,9 +79,9 @@ public class ContactExtractorTest {
@Before
public void setup() throws Exception {
String attribute = "ExtractedContacts";
- MailetContainer.Builder mailets = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailets = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
.postmaster(SENDER)
- .addProcessor(
+ .putProcessor(
ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 36dc533..87e24f6 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
@@ -87,7 +87,7 @@ public class GroupMappingTest {
@Before
public void setup() throws Exception {
MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(ProcessorConfiguration.transport()
+ .putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RecipientRewriteTable.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 1745adc..c697124 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
@@ -446,8 +446,8 @@ public class ICSAttachmentWorkflowTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(ProcessorConfiguration.transport()
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 f20a7e2..e5b97b4 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
@@ -71,8 +71,8 @@ public class SpamAssassinTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailets = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(
+ MailetContainer.Builder mailets = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(
ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/55dc6ff9/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 bd17057..065db56 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -63,8 +63,8 @@ public class StripAttachmentTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
- .addProcessor(ProcessorConfiguration.transport()
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(StripAttachment.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[38/44] james-project git commit: JAMES-2267 Factorize a bit user
creation in RRT integration test
Posted by bt...@apache.org.
JAMES-2267 Factorize a bit user creation in RRT integration test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/85e48efc
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/85e48efc
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/85e48efc
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 85e48efcc0f7c18f6de958abedb49e0085ce49ad
Parents: 21e1326
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 11:44:53 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:38 2018 +0700
----------------------------------------------------------------------
.../org/apache/mailet/base/test/FakeMail.java | 14 +++++++-------
.../RecipientRewriteTableIntegrationTest.java | 19 ++++---------------
2 files changed, 11 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/85e48efc/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index bcb59f9..4dc8dbb 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -44,6 +44,7 @@ import org.apache.mailet.PerRecipientHeaders;
import org.apache.mailet.PerRecipientHeaders.Header;
import com.github.fge.lambdas.Throwing;
+import com.github.steveash.guavate.Guavate;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -151,22 +152,21 @@ public class FakeMail implements Mail {
}
public Builder recipients(MailAddress... recipients) {
- this.recipients.addAll(ImmutableList.copyOf(recipients));
- return this;
+ return recipients(ImmutableList.copyOf(recipients));
}
public Builder recipients(String... recipients) {
- Arrays.stream(recipients).forEach(Throwing.consumer(this::recipient));
- return this;
+ return recipients(Arrays.stream(recipients)
+ .map(Throwing.function(MailAddress::new))
+ .collect(Guavate.toImmutableList()));
}
public Builder recipient(MailAddress recipient) {
- this.recipients.add(recipient);
- return this;
+ return recipients(recipient);
}
public Builder recipient(String recipient) throws AddressException {
- return recipient(new MailAddress(recipient));
+ return recipients(recipient);
}
public Builder name(String name) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/85e48efc/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index e59342a..041e001 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -41,10 +41,8 @@ public class RecipientRewriteTableIntegrationTest {
private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
-
private static final String ANY_AT_JAMES = "any@" + DEFAULT_DOMAIN;
private static final String OTHER_AT_JAMES = "other@" + DEFAULT_DOMAIN;
-
private static final String ANY_AT_ANOTHER_DOMAIN = "any@" + JAMES_ANOTHER_DOMAIN;
@Rule
@@ -64,6 +62,10 @@ public class RecipientRewriteTableIntegrationTest {
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addDomain(JAMES_ANOTHER_DOMAIN);
+
+ dataProbe.addUser(RECIPIENT, PASSWORD);
+ dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
+ dataProbe.addUser(OTHER_AT_JAMES, PASSWORD);
}
@After
@@ -73,10 +75,6 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void rrtServiceShouldDeliverEmailToMappingRecipients() throws Exception {
- dataProbe.addUser(FROM, PASSWORD);
- dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
- dataProbe.addUser(OTHER_AT_JAMES, PASSWORD);
-
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
@@ -96,11 +94,6 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void rrtServiceShouldNotDeliverEmailToRecipientWhenHaveMappingRecipients() throws Exception {
- dataProbe.addUser(FROM, PASSWORD);
- dataProbe.addUser(RECIPIENT, PASSWORD);
- dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
- dataProbe.addUser(OTHER_AT_JAMES, PASSWORD);
-
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
@@ -118,9 +111,7 @@ public class RecipientRewriteTableIntegrationTest {
public void rrtServiceShouldDeliverEmailToRecipientOnLocalWhenMappingContainsNonDomain() throws Exception {
String nonDomainUser = "nondomain";
String localUser = nonDomainUser + "@" + dataProbe.getDefaultDomain();
- dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(localUser, PASSWORD);
- dataProbe.addUser(OTHER_AT_JAMES, PASSWORD);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, nonDomainUser);
dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
@@ -142,7 +133,6 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void messageShouldRedirectToTheSameUserWhenDomainMapping() throws Exception {
dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
- dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
dataProbe.addUser(ANY_AT_ANOTHER_DOMAIN, PASSWORD);
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
@@ -158,7 +148,6 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void messageShouldNotSendToRecipientWhenDomainMapping() throws Exception {
dataProbe.addDomainAliasMapping(DEFAULT_DOMAIN, JAMES_ANOTHER_DOMAIN);
- dataProbe.addUser(ANY_AT_JAMES, PASSWORD);
dataProbe.addUser(ANY_AT_ANOTHER_DOMAIN, PASSWORD);
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[19/44] james-project git commit: JAMES-2267 Easy awaitSent for Smtp
client
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92484c/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
index f8c0f14..14173f9 100644
--- a/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
+++ b/server/testing/src/main/java/org/apache/james/utils/SMTPMessageSender.java
@@ -37,6 +37,7 @@ import org.apache.mailet.Mail;
import com.github.fge.lambdas.Throwing;
import com.google.common.base.Throwables;
+import com.jayway.awaitility.core.ConditionFactory;
public class SMTPMessageSender implements Closeable {
@@ -64,7 +65,7 @@ public class SMTPMessageSender implements Closeable {
this.senderDomain = senderDomain;
}
- public void sendMessage(String from, String recipient) {
+ public SMTPMessageSender sendMessage(String from, String recipient) {
try {
smtpClient.helo(senderDomain);
smtpClient.setSender(from);
@@ -77,9 +78,10 @@ public class SMTPMessageSender implements Closeable {
} catch (IOException e) {
throw Throwables.propagate(e);
}
+ return this;
}
- public void sendMessageNoBracket(String from, String recipient) {
+ public SMTPMessageSender sendMessageNoBracket(String from, String recipient) {
try {
smtpClient.helo(senderDomain);
smtpClient.setSender(from);
@@ -92,9 +94,10 @@ public class SMTPMessageSender implements Closeable {
} catch (IOException e) {
throw Throwables.propagate(e);
}
+ return this;
}
- public void sendMessageWithHeaders(String from, String recipient, String message) {
+ public SMTPMessageSender sendMessageWithHeaders(String from, String recipient, String message) {
try {
smtpClient.helo(senderDomain);
smtpClient.setSender(from);
@@ -103,9 +106,10 @@ public class SMTPMessageSender implements Closeable {
} catch (IOException e) {
throw Throwables.propagate(e);
}
+ return this;
}
- public void sendMessage(Mail mail) throws MessagingException {
+ public SMTPMessageSender sendMessage(Mail mail) throws MessagingException {
try {
String from = mail.getSender().asString();
smtpClient.helo(senderDomain);
@@ -117,6 +121,7 @@ public class SMTPMessageSender implements Closeable {
} catch (IOException e) {
throw Throwables.propagate(e);
}
+ return this;
}
private String asString(Message message) throws IOException, MessagingException {
@@ -130,6 +135,10 @@ public class SMTPMessageSender implements Closeable {
.contains("250 2.6.0 Message received");
}
+ public void awaitSent(ConditionFactory conditionFactory) {
+ conditionFactory.until(this::messageHasBeenSent);
+ }
+
public boolean messageSendingFailed() throws IOException {
String replyString = smtpClient.getReplyString().trim();
return replyString.startsWith("4") || replyString.startsWith("5");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[13/44] james-project git commit: JAMES-2267 Temporary James server
should accept SmtpConfiguration builders
Posted by bt...@apache.org.
JAMES-2267 Temporary James server should accept SmtpConfiguration builders
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c096920e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c096920e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c096920e
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: c096920e3a5d690051b75b15dc81c03fa9f51c38
Parents: 28eb15b
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 09:25:30 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:19 2018 +0700
----------------------------------------------------------------------
.../test/java/org/apache/james/mailets/TemporaryJamesServer.java | 4 ++++
.../java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 2 +-
.../java/org/apache/james/smtp/SmtpBracketEnforcementTest.java | 2 +-
.../java/org/apache/james/smtp/SmtpIdentityVerificationTest.java | 2 +-
.../test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c096920e/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index 5e47f0e..2328eea 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -83,6 +83,10 @@ public class TemporaryJamesServer {
return this;
}
+ public Builder withSmtpConfiguration(SmtpConfiguration.Builder smtpConfiguration) {
+ return withSmtpConfiguration(smtpConfiguration.build());
+ }
+
public Builder withMailetContainer(MailetContainer mailetConfiguration) {
this.mailetConfiguration = Optional.of(mailetConfiguration);
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c096920e/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 d70df3c..1e8ba38 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
@@ -132,7 +132,7 @@ public class SmtpAuthorizedAddressesTest {
.build();
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withSmtpConfiguration(smtpConfiguration.build())
+ .withSmtpConfiguration(smtpConfiguration)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c096920e/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 1ceafc3..468b078 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
@@ -77,7 +77,7 @@ public class SmtpBracketEnforcementTest {
.build();
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
- .withSmtpConfiguration(smtpConfiguration.build())
+ .withSmtpConfiguration(smtpConfiguration)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c096920e/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 fdf6e7e..cda3ad2 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
@@ -76,7 +76,7 @@ public class SmtpIdentityVerificationTest {
.build();
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
- .withSmtpConfiguration(smtpConfiguration.build())
+ .withSmtpConfiguration(smtpConfiguration)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c096920e/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 cc3b9eb..a7df9d2 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
@@ -79,7 +79,7 @@ public class SmtpSizeLimitationTest {
.build();
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_ONLY_MODULE)
- .withSmtpConfiguration(smtpConfiguration.build())
+ .withSmtpConfiguration(smtpConfiguration)
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[32/44] james-project git commit: JAMES-2267 Make InMemorySmtp
slightly easier to work with
Posted by bt...@apache.org.
JAMES-2267 Make InMemorySmtp slightly easier to work with
Also, a SMTP gateway allows to get ride of it.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c6532c8f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c6532c8f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c6532c8f
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: c6532c8fb762ef63c9970b259964e022aab20349
Parents: 5f65878
Author: benwa <bt...@linagora.com>
Authored: Thu Dec 21 11:11:31 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:33:52 2018 +0700
----------------------------------------------------------------------
.../apache/james/mpt/smtp/ForwardSmtpTest.java | 5 +----
.../james/dnsservice/api/InMemoryDNSService.java | 6 ++++++
.../GatewayRemoteDeliveryIntegrationTest.java | 19 +++++--------------
.../transport/mailets/GroupMappingTest.java | 15 +++------------
.../james/jmap/VacationRelayIntegrationTest.java | 5 +----
5 files changed, 16 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c6532c8f/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index 12e41fb..bcfdd5d 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -22,7 +22,6 @@ import static com.jayway.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static org.hamcrest.Matchers.equalTo;
-import java.net.InetAddress;
import java.util.Locale;
import org.apache.james.mpt.script.SimpleScriptedTestProtocol;
@@ -70,11 +69,9 @@ public abstract class ForwardSmtpTest {
scriptedTest = new SimpleScriptedTestProtocol("/org/apache/james/smtp/scripts/", hostSystem)
.withLocale(Locale.US)
.withUser(USER_AT_DOMAIN, PASSWORD);
-
- InetAddress containerIp = InetAddress.getByName(fakeSmtp.getContainerIp());
hostSystem.getInMemoryDnsService()
- .registerRecord("yopmail.com", containerIp, "yopmail.com");
+ .registerMxRecord("yopmail.com", fakeSmtp.getContainerIp());
hostSystem.addAddressMapping(USER, DOMAIN, "ray@yopmail.com");
RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
http://git-wip-us.apache.org/repos/asf/james-project/blob/c6532c8f/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java
index 851ace7..3a3ff92 100644
--- a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java
+++ b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java
@@ -56,6 +56,12 @@ public class InMemoryDNSService implements DNSService {
registerRecord(hostname, ImmutableList.of(address), ImmutableList.of(mxRecord), emptyTxtRecords);
}
+ public InMemoryDNSService registerMxRecord(String hostname, String ip) throws UnknownHostException {
+ InetAddress containerIp = InetAddress.getByName(ip);
+ registerRecord(hostname, containerIp, hostname);
+ return this;
+ }
+
public void registerRecord(String hostname, List<InetAddress> addresses, Collection<String> mxRecords, Collection<String> txtRecords ){
records.put(hostname, dnsRecordFor(mxRecords, txtRecords, addresses));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c6532c8f/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index f5d3818..55900f0 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -31,7 +31,6 @@ import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
-import java.net.InetAddress;
import java.util.concurrent.TimeUnit;
import org.apache.james.dnsservice.api.DNSService;
@@ -85,12 +84,16 @@ public class GatewayRemoteDeliveryIntegrationTest {
private TemporaryJamesServer jamesServer;
private DataProbe dataProbe;
+ private InMemoryDNSService inMemoryDNSService;
@Before
public void setup() throws Exception {
awaitOneMinute.until(() -> fakeSmtp.tryConnect(25));
RestAssured.requestSpecification = FakeSmtpHelper.requestSpecification(fakeSmtp.getContainerIp());
+
+ inMemoryDNSService = new InMemoryDNSService()
+ .registerMxRecord(JAMES_ANOTHER_DOMAIN, fakeSmtp.getContainerIp());
}
@After
@@ -179,9 +182,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Test
public void outgoingMailShouldNotBeSentDirectlyToTheHostWhenGatewayFails() throws Exception {
String gatewayProperty = "invalid.domain";
- InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
- InetAddress containerIp = InetAddress.getByName(fakeSmtp.getContainerIp());
- inMemoryDNSService.registerRecord(JAMES_ANOTHER_DOMAIN, containerIp, JAMES_ANOTHER_DOMAIN);
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
@@ -203,12 +203,10 @@ public class GatewayRemoteDeliveryIntegrationTest {
.statusCode(200)
.body("", hasSize(0));
}
+
@Test
public void remoteDeliveryShouldBounceUponFailure() throws Exception {
String gatewayProperty = "invalid.domain";
- InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
- InetAddress containerIp = InetAddress.getByName(fakeSmtp.getContainerIp());
- inMemoryDNSService.registerRecord(JAMES_ANOTHER_DOMAIN, containerIp, JAMES_ANOTHER_DOMAIN);
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
@@ -237,9 +235,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Test
public void remoteDeliveryShouldBounceUponFailureWhenNoBounceProcessor() throws Exception {
String gatewayProperty = "invalid.domain";
- InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
- InetAddress containerIp = InetAddress.getByName(fakeSmtp.getContainerIp());
- inMemoryDNSService.registerRecord(JAMES_ANOTHER_DOMAIN, containerIp, JAMES_ANOTHER_DOMAIN);
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
@@ -279,10 +274,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
@Test
public void directResolutionShouldBeWellPerformed() throws Exception {
- InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
- InetAddress containerIp = InetAddress.getByName(fakeSmtp.getContainerIp());
- inMemoryDNSService.registerRecord(JAMES_ANOTHER_DOMAIN, containerIp, JAMES_ANOTHER_DOMAIN);
-
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
http://git-wip-us.apache.org/repos/asf/james-project/blob/c6532c8f/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 9a95c42..5f51620 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
@@ -30,13 +30,10 @@ import static org.apache.james.mailets.configuration.Constants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
-import java.net.InetAddress;
import java.util.concurrent.TimeUnit;
import javax.mail.internet.MimeMessage;
-import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -90,7 +87,6 @@ public class GroupMappingTest {
.withAffinityToContainer()
.waitingFor(new HostPortWaitStrategy());
- private final InMemoryDNSService inMemoryDNSService = new InMemoryDNSService();
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
@@ -98,13 +94,8 @@ public class GroupMappingTest {
@Rule
public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
- private InetAddress containerIp;
@Before
public void setup() throws Exception {
-
- containerIp = InetAddress.getByName(fakeSmtp.getContainerIp());
- inMemoryDNSService.registerRecord("yopmail.com", containerIp, "yopmail.com");
-
MailetContainer mailetContainer = MailetContainer.builder()
.addProcessor(CommonProcessors.simpleRoot())
.addProcessor(CommonProcessors.error())
@@ -126,11 +117,11 @@ public class GroupMappingTest {
.addProperty("maxDnsProblemRetries", "0")
.addProperty("deliveryThreads", "10")
.addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")))
+ .addProperty("bounceProcessor", "bounces")
+ .addProperty("gateway", fakeSmtp.getContainerIp())))
.build();
jamesServer = TemporaryJamesServer.builder()
- .withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
@@ -464,7 +455,7 @@ public class GroupMappingTest {
.until(() -> {
try {
with()
- .baseUri("http://" + containerIp.getHostAddress())
+ .baseUri("http://" + fakeSmtp.getContainerIp())
.port(80)
.get("/api/email")
.then()
http://git-wip-us.apache.org/repos/asf/james-project/blob/c6532c8f/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
index 3ef66d6..dda4ddd 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
@@ -21,7 +21,6 @@ package org.apache.james.jmap;
import static org.hamcrest.Matchers.equalTo;
-import java.net.InetAddress;
import java.util.concurrent.TimeUnit;
import org.apache.commons.net.smtp.SMTPClient;
@@ -79,10 +78,8 @@ public abstract class VacationRelayIntegrationTest {
@Before
public void setUp() throws Exception {
-
- InetAddress containerIp = InetAddress.getByName(fakeSmtp.getContainerIp());
getInMemoryDns()
- .registerRecord("yopmail.com", containerIp, "yopmail.com");
+ .registerMxRecord("yopmail.com", fakeSmtp.getContainerIp());
guiceJamesServer = getJmapServer();
guiceJamesServer.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[11/44] james-project git commit: JAMES-2267 MailetContainer
integration: provide a default value for threads
Posted by bt...@apache.org.
JAMES-2267 MailetContainer integration: provide a default value for threads
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7fa62d66
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7fa62d66
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7fa62d66
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: 7fa62d6607cc421e7f521fed882c9b7929da0221
Parents: b8e7d52
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 11:23:07 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:51 2018 +0700
----------------------------------------------------------------------
.../org/apache/james/mailets/AddDeliveredToHeaderTest.java | 1 -
.../java/org/apache/james/mailets/BounceIntegrationTest.java | 1 -
.../apache/james/mailets/CommonMailetConfigurationTest.java | 1 -
.../james/mailets/GatewayRemoteDeliveryIntegrationTest.java | 4 ----
.../apache/james/mailets/NetworkMatcherIntegrationTest.java | 1 -
.../james/mailets/RecipientRewriteTableIntegrationTest.java | 1 -
.../test/java/org/apache/james/mailets/SieveDelivery.java | 1 -
.../org/apache/james/mailets/SmtpAuthIntegrationTest.java | 1 -
.../apache/james/mailets/configuration/MailetContainer.java | 8 ++++++--
.../james/mailets/crypto/SMIMEDecryptIntegrationTest.java | 1 -
.../james/mailets/crypto/SMIMESignIntegrationTest.java | 1 -
.../org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 1 -
.../org/apache/james/smtp/SmtpBracketEnforcementTest.java | 1 -
.../org/apache/james/smtp/SmtpIdentityVerificationTest.java | 1 -
.../java/org/apache/james/smtp/SmtpSizeLimitationTest.java | 1 -
.../james/transport/mailets/AmqpForwardAttachmentTest.java | 1 -
.../apache/james/transport/mailets/ContactExtractorTest.java | 4 +---
.../org/apache/james/transport/mailets/GroupMappingTest.java | 1 -
.../james/transport/mailets/ICSAttachmentWorkflowTest.java | 1 -
.../apache/james/transport/mailets/StripAttachmentTest.java | 1 -
20 files changed, 7 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
index ef1bc5d..fda90d0 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -56,7 +56,6 @@ public class AddDeliveredToHeaderTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index f79e61c..c92dd50 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
@@ -246,7 +246,6 @@ public class BounceIntegrationTest {
private MailetContainer generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
return MailetContainer.builder()
.postmaster(POSTMASTER)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
index 67ea84b..ee78589 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -55,7 +55,6 @@ public class CommonMailetConfigurationTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 5eb773b..37458f2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -239,7 +239,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.build(temporaryFolder, MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
@@ -271,7 +270,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.build(temporaryFolder, MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
@@ -320,7 +318,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.build(temporaryFolder, MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(directResolutionTransport())
@@ -356,7 +353,6 @@ public class GatewayRemoteDeliveryIntegrationTest {
private MailetContainer generateMailetContainerConfiguration(String gatewayProperty) {
return MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(root())
.addProcessor(CommonProcessors.error())
.addProcessor(relayOnlyTransport(gatewayProperty))
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 985b906..a38c1bf 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -77,7 +77,6 @@ public class NetworkMatcherIntegrationTest {
private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(rootProcessor)
.addProcessor(CommonProcessors.error())
.addProcessor(deliverOnlyTransport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index 3b6a061..2cf095e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -66,7 +66,6 @@ public class RecipientRewriteTableIntegrationTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 11aa9e6..b81e756 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
@@ -57,7 +57,6 @@ public class SieveDelivery {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 f2a7b04..d692395 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
@@ -78,7 +78,6 @@ public class SmtpAuthIntegrationTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(rootProcessor)
.addProcessor(CommonProcessors.error())
.addProcessor(deliverOnlyTransport())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
index 7dfc216..49b4ced 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -21,6 +21,7 @@
package org.apache.james.mailets.configuration;
import java.util.List;
+import java.util.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -34,12 +35,14 @@ public class MailetContainer implements SerializableAsXml {
public static class Builder {
+ public static final int DEFAULT_THREAD_COUNT = 5;
private String postmaster;
- private int threads;
+ private Optional<Integer> threads;
private ImmutableList.Builder<ProcessorConfiguration> processors;
private Builder() {
processors = ImmutableList.builder();
+ threads = Optional.empty();
}
public Builder postmaster(String postmaster) {
@@ -48,7 +51,7 @@ public class MailetContainer implements SerializableAsXml {
}
public Builder threads(int threads) {
- this.threads = threads;
+ this.threads = Optional.of(threads);
return this;
}
@@ -63,6 +66,7 @@ public class MailetContainer implements SerializableAsXml {
}
public MailetContainer build() {
+ int threads = this.threads.orElse(DEFAULT_THREAD_COUNT);
Preconditions.checkState(!Strings.isNullOrEmpty(postmaster), "'postmaster' is mandatory");
Preconditions.checkState(threads > 0, "'threads' should be greater than 0");
return new MailetContainer(postmaster, threads, processors.build());
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 19ca898..7663084 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
@@ -73,7 +73,6 @@ public class SMIMEDecryptIntegrationTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 c943d76..1ea352f 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
@@ -79,7 +79,6 @@ public class SMIMESignIntegrationTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 389af55..9377887 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
@@ -109,7 +109,6 @@ public class SmtpAuthorizedAddressesTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 bfc553b..b1e6af9 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
@@ -72,7 +72,6 @@ public class SmtpBracketEnforcementTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 2dc73d2..3a22a07 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
@@ -74,7 +74,6 @@ public class SmtpIdentityVerificationTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 46d90b9..1be05cb 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
@@ -73,7 +73,6 @@ public class SmtpSizeLimitationTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DEFAULT_DOMAIN)
- .threads(5)
.addProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 11108ff..ea2f222 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
@@ -89,7 +89,6 @@ public class AmqpForwardAttachmentTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 e63a9db..cdbc936 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
@@ -77,9 +77,7 @@ public class ContactExtractorTest {
@Before
public void setup() throws Exception {
String attribute = "ExtractedContacts";
- MailetContainer mailets = MailetContainer
- .builder()
- .threads(5)
+ MailetContainer mailets = MailetContainer.builder()
.postmaster(SENDER)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 9911a21..438ad12 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
@@ -109,7 +109,6 @@ public class GroupMappingTest {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + DOMAIN1)
- .threads(5)
.addProcessor(ProcessorConfiguration.root()
.enableJmx(true)
.addMailet(MailetConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 2359b00..09f6b50 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
@@ -455,7 +455,6 @@ public class ICSAttachmentWorkflowTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
http://git-wip-us.apache.org/repos/asf/james-project/blob/7fa62d66/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 69397e2..478a1df 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
@@ -73,7 +73,6 @@ public class StripAttachmentTest {
public void setup() throws Exception {
MailetContainer mailetContainer = MailetContainer.builder()
.postmaster("postmaster@" + JAMES_APACHE_ORG)
- .threads(5)
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(ProcessorConfiguration.transport()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[39/44] james-project git commit: JAMES-2262 Allow mailet container
configuration to override processors
Posted by bt...@apache.org.
JAMES-2262 Allow mailet container configuration to override processors
This allow to derivate base configuration and specify only processors that changed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ea5cf6fe
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ea5cf6fe
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ea5cf6fe
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: ea5cf6fed6ee8abdd9677e755303d19fcd8fba18
Parents: 51c64ca
Author: benwa <bt...@linagora.com>
Authored: Mon Dec 25 10:14:30 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:34:38 2018 +0700
----------------------------------------------------------------------
.../james/mailets/BounceIntegrationTest.java | 5 +-
.../GatewayRemoteDeliveryIntegrationTest.java | 14 +---
.../mailets/NetworkMatcherIntegrationTest.java | 4 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 6 +-
.../james/mailets/TemporaryJamesServer.java | 15 +++-
.../mailets/configuration/MailetContainer.java | 14 ++--
.../james/smtp/SmtpAuthorizedAddressesTest.java | 12 +--
.../mailets/AmqpForwardAttachmentTest.java | 42 +++++------
.../transport/mailets/ContactExtractorTest.java | 9 +--
.../transport/mailets/GroupMappingTest.java | 8 +-
.../mailets/ICSAttachmentWorkflowTest.java | 78 ++++++++++----------
.../transport/mailets/StripAttachmentTest.java | 36 ++++-----
12 files changed, 107 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index e5a3cc2..910af99 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
@@ -28,7 +28,6 @@ import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
import static org.apache.james.mailets.configuration.Constants.awaitOneMinute;
import org.apache.james.MemoryJamesServerMain;
-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;
@@ -248,10 +247,8 @@ public class BounceIntegrationTest {
}
private MailetContainer.Builder generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
- return MailetContainer.builder()
+ return TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.postmaster(POSTMASTER)
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
.addProcessor(transport())
.addProcessor(bounces(redirectionMailetConfiguration));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index b4586d1..0c30246 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -231,16 +231,13 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(MailetContainer.builder()
- .addProcessor(CommonProcessors.simpleRoot())
- .addProcessor(CommonProcessors.error())
+ .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.remoteDeliveryBuilderNoBounces()
.matcher(All.class)
- .addProperty("gateway", gatewayProperty)))
- .addProcessor(CommonProcessors.bounces()))
+ .addProperty("gateway", gatewayProperty))))
.build(temporaryFolder);
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
@@ -286,11 +283,8 @@ public class GatewayRemoteDeliveryIntegrationTest {
}
private MailetContainer.Builder generateMailetContainerConfiguration(String gatewayProperty) {
- return MailetContainer.builder()
- .addProcessor(CommonProcessors.simpleRoot())
- .addProcessor(CommonProcessors.error())
- .addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
- .addProcessor(CommonProcessors.bounces());
+ return TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .addProcessor(relayAndLocalDeliveryTransport(gatewayProperty));
}
private ProcessorConfiguration.Builder relayAndLocalDeliveryTransport(String gatewayProperty) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index f8e41c6..2f87c73 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -30,7 +30,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.MemoryJamesServerMain;
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.probe.DataProbe;
import org.apache.james.transport.mailets.ToProcessor;
@@ -63,9 +62,8 @@ public class NetworkMatcherIntegrationTest {
private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
TemporaryJamesServer temporaryJamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(MailetContainer.builder()
+ .withMailetContainer(TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(rootProcessor)
- .addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.deliverOnlyTransport()))
.build(temporaryFolder);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/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 2a57982..7e82e39 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
@@ -71,12 +71,10 @@ public class SmtpAuthIntegrationTest {
.addMailet(MailetConfiguration.TO_BOUNCE)
.build();
- MailetContainer mailetContainer = MailetContainer.builder()
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(rootProcessor)
- .addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.deliverOnlyTransport())
- .addProcessor(bounces())
- .build();
+ .addProcessor(bounces());
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index 2328eea..265580c 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -49,7 +49,7 @@ import com.google.inject.Module;
public class TemporaryJamesServer {
- public static final MailetContainer DEFAUL_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
+ public static final MailetContainer.Builder DEFAUL_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
.addProcessor(CommonProcessors.root())
.addProcessor(CommonProcessors.error())
.addProcessor(CommonProcessors.transport())
@@ -57,8 +57,15 @@ public class TemporaryJamesServer {
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
.addProcessor(CommonProcessors.bounces())
- .addProcessor(CommonProcessors.sieveManagerCheck())
- .build();
+ .addProcessor(CommonProcessors.sieveManagerCheck());
+
+ public static final MailetContainer.Builder SIMPLE_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
+ .addProcessor(CommonProcessors.simpleRoot())
+ .addProcessor(CommonProcessors.error())
+ .addProcessor(CommonProcessors.transport())
+ .addProcessor(CommonProcessors.localAddressError())
+ .addProcessor(CommonProcessors.relayDenied())
+ .addProcessor(CommonProcessors.bounces());
public static class Builder {
private ImmutableList.Builder<Module> overrideModules;
@@ -105,7 +112,7 @@ public class TemporaryJamesServer {
public TemporaryJamesServer build(TemporaryFolder temporaryFolder) throws Exception {
return new TemporaryJamesServer(
temporaryFolder,
- mailetConfiguration.orElse(DEFAUL_MAILET_CONTAINER_CONFIGURATION),
+ mailetConfiguration.orElse(DEFAUL_MAILET_CONTAINER_CONFIGURATION.build()),
smtpConfiguration.orElse(SmtpConfiguration.DEFAULT),
module.orElse(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE),
overrideModules.build());
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
index 2adbf9e..c9ed6bb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -20,7 +20,9 @@
package org.apache.james.mailets.configuration;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import com.google.common.base.Preconditions;
@@ -39,10 +41,10 @@ public class MailetContainer implements SerializableAsXml {
public static final String DEFAULT_POSTMASTER = "postmaster@localhost";
private Optional<String> postmaster;
private Optional<Integer> threads;
- private ImmutableList.Builder<ProcessorConfiguration> processors;
+ private Map<String, ProcessorConfiguration> processors;
private Builder() {
- processors = ImmutableList.builder();
+ processors = new HashMap<>();
threads = Optional.empty();
postmaster = Optional.empty();
}
@@ -58,13 +60,12 @@ public class MailetContainer implements SerializableAsXml {
}
public Builder addProcessor(ProcessorConfiguration processorConfiguration) {
- this.processors.add(processorConfiguration);
+ this.processors.put(processorConfiguration.getState(), processorConfiguration);
return this;
}
public Builder addProcessor(ProcessorConfiguration.Builder processorConfiguration) {
- this.processors.add(processorConfiguration.build());
- return this;
+ return this.addProcessor(processorConfiguration.build());
}
public MailetContainer build() {
@@ -72,7 +73,8 @@ public class MailetContainer implements SerializableAsXml {
int threads = this.threads.orElse(DEFAULT_THREAD_COUNT);
Preconditions.checkState(!Strings.isNullOrEmpty(postmaster), "'postmaster' is mandatory");
Preconditions.checkState(threads > 0, "'threads' should be greater than 0");
- return new MailetContainer(postmaster, threads, processors.build());
+ return new MailetContainer(postmaster, threads,
+ ImmutableList.copyOf(processors.values()));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/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 f4940dd..d7c86ff 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
@@ -30,7 +30,6 @@ import static org.hamcrest.Matchers.hasSize;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -83,20 +82,15 @@ public class SmtpAuthorizedAddressesTest {
}
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.simpleRoot())
- .addProcessor(CommonProcessors.error())
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(SMTPIsAuthNetwork.class)
.addProperty("gateway", fakeSmtp.getContainerIp()))
- .addMailet(MailetConfiguration.TO_BOUNCE))
- .addProcessor(CommonProcessors.localAddressError())
- .addProcessor(CommonProcessors.relayDenied())
- .addProcessor(CommonProcessors.bounces())
- .build();
+ .addMailet(MailetConfiguration.TO_BOUNCE));
+
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withSmtpConfiguration(smtpConfiguration)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/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 2d4dd3f..9e84419 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
@@ -31,7 +31,6 @@ import java.nio.charset.StandardCharsets;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -79,29 +78,26 @@ public class AmqpForwardAttachmentTest {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(StripAttachment.class)
- .addProperty(StripAttachment.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
- .addProperty(StripAttachment.PATTERN_PARAMETER_NAME, ".*\\.txt"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(MimeDecodingMailet.class)
- .addProperty(MimeDecodingMailet.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(AmqpForwardAttribute.class)
- .addProperty(AmqpForwardAttribute.URI_PARAMETER_NAME, amqpRule.getAmqpUri())
- .addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE_NAME)
- .addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
- .addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY))
- .addMailet(MailetConfiguration.LOCAL_DELIVERY))
- .build();
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(StripAttachment.class)
+ .addProperty(StripAttachment.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
+ .addProperty(StripAttachment.PATTERN_PARAMETER_NAME, ".*\\.txt"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(MimeDecodingMailet.class)
+ .addProperty(MimeDecodingMailet.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(AmqpForwardAttribute.class)
+ .addProperty(AmqpForwardAttribute.URI_PARAMETER_NAME, amqpRule.getAmqpUri())
+ .addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE_NAME)
+ .addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE)
+ .addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY));
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/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 335b3cd..44b85dc 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
@@ -31,7 +31,6 @@ import java.util.Optional;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -79,10 +78,8 @@ public class ContactExtractorTest {
@Before
public void setup() throws Exception {
String attribute = "ExtractedContacts";
- MailetContainer mailets = MailetContainer.builder()
+ MailetContainer.Builder mailets = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.postmaster(SENDER)
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
.addProcessor(
ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
@@ -96,8 +93,8 @@ public class ContactExtractorTest {
.addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE)
.addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, attribute))
.addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.LOCAL_DELIVERY))
- .build();
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY));
+
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailets)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/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 fb82b8d..6f629dc 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
@@ -37,7 +37,6 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailbox.model.MailboxConstants;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -96,9 +95,7 @@ public class GroupMappingTest {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.simpleRoot())
- .addProcessor(CommonProcessors.error())
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
@@ -110,8 +107,7 @@ public class GroupMappingTest {
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(All.class)
- .addProperty("gateway", fakeSmtp.getContainerIp())))
- .build();
+ .addProperty("gateway", fakeSmtp.getContainerIp())));
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/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 c035991..337f34e 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
@@ -35,7 +35,6 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.jmap.mailet.TextCalendarBodyToAttachment;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -446,47 +445,44 @@ public class ICSAttachmentWorkflowTest {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(StripAttachment.class)
- .addProperty("attribute", MAIL_ATTRIBUTE)
- .addProperty("pattern", ".*"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(MimeDecodingMailet.class)
- .addProperty("attribute", MAIL_ATTRIBUTE))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ICalendarParser.class)
- .addProperty("sourceAttribute", MAIL_ATTRIBUTE)
- .addProperty("destinationAttribute", PARSED_ICAL_MAIL_ATTRIBUTE))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ICALToHeader.class)
- .addProperty("attribute", PARSED_ICAL_MAIL_ATTRIBUTE))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ICALToJsonAttribute.class)
- .addProperty("source", PARSED_ICAL_MAIL_ATTRIBUTE)
- .addProperty("rawSource", MAIL_ATTRIBUTE)
- .addProperty("destination", JSON_MAIL_ATTRIBUTE))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(TextCalendarBodyToAttachment.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(AmqpForwardAttribute.class)
- .addProperty("uri", amqpRule.getAmqpUri())
- .addProperty("exchange", EXCHANGE_NAME)
- .addProperty("attribute", JSON_MAIL_ATTRIBUTE)
- .addProperty("routing_key", ROUTING_KEY))
- .addMailet(MailetConfiguration.LOCAL_DELIVERY))
- .build();
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(StripAttachment.class)
+ .addProperty("attribute", MAIL_ATTRIBUTE)
+ .addProperty("pattern", ".*"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(MimeDecodingMailet.class)
+ .addProperty("attribute", MAIL_ATTRIBUTE))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ICalendarParser.class)
+ .addProperty("sourceAttribute", MAIL_ATTRIBUTE)
+ .addProperty("destinationAttribute", PARSED_ICAL_MAIL_ATTRIBUTE))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ICALToHeader.class)
+ .addProperty("attribute", PARSED_ICAL_MAIL_ATTRIBUTE))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ICALToJsonAttribute.class)
+ .addProperty("source", PARSED_ICAL_MAIL_ATTRIBUTE)
+ .addProperty("rawSource", MAIL_ATTRIBUTE)
+ .addProperty("destination", JSON_MAIL_ATTRIBUTE))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(TextCalendarBodyToAttachment.class))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(AmqpForwardAttribute.class)
+ .addProperty("uri", amqpRule.getAmqpUri())
+ .addProperty("exchange", EXCHANGE_NAME)
+ .addProperty("attribute", JSON_MAIL_ATTRIBUTE)
+ .addProperty("routing_key", ROUTING_KEY))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY));
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea5cf6fe/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 03d45b4..535526b 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
@@ -31,7 +31,6 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.MemoryJamesServerMain;
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.MailetContainer;
import org.apache.james.mailets.configuration.ProcessorConfiguration;
@@ -63,26 +62,23 @@ public class StripAttachmentTest {
@Before
public void setup() throws Exception {
- MailetContainer mailetContainer = MailetContainer.builder()
- .addProcessor(CommonProcessors.root())
- .addProcessor(CommonProcessors.error())
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAUL_MAILET_CONTAINER_CONFIGURATION
.addProcessor(ProcessorConfiguration.transport()
- .addMailet(MailetConfiguration.BCC_STRIPPER)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(StripAttachment.class)
- .addProperty("attribute", "my.attribute")
- .addProperty("remove", "all")
- .addProperty("notpattern", ".*.tmp.*"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(OnlyText.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(RecoverAttachment.class)
- .addProperty("attribute", "my.attribute"))
- .addMailet(MailetConfiguration.LOCAL_DELIVERY))
- .build();
+ .addMailet(MailetConfiguration.BCC_STRIPPER)
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(StripAttachment.class)
+ .addProperty("attribute", "my.attribute")
+ .addProperty("remove", "all")
+ .addProperty("notpattern", ".*.tmp.*"))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(OnlyText.class))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(RecoverAttachment.class)
+ .addProperty("attribute", "my.attribute"))
+ .addMailet(MailetConfiguration.LOCAL_DELIVERY));
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[06/44] james-project git commit: JAMES-2267 Improve
MimeMessageBuilder fluency: implicit build calling
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/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 1561c54..2d86d4d 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
@@ -90,40 +90,33 @@ public class SMIMESignIntegrationTest {
.matcher(SMTPAuthSuccessful.class)
.mailet(SetMimeHeader.class)
.addProperty("name", "X-UserIsAuth")
- .addProperty("value", "true")
- .build())
+ .addProperty("value", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(HasMailAttribute.class)
.matcherCondition("org.apache.james.SMIMECheckSignature")
.mailet(SetMimeHeader.class)
.addProperty("name", "X-WasSigned")
- .addProperty("value", "true")
- .build())
+ .addProperty("value", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RemoveMimeHeader.class)
- .addProperty("name", "bcc")
- .build())
+ .addProperty("name", "bcc"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
- .mailet(RecipientRewriteTable.class)
- .build())
+ .mailet(RecipientRewriteTable.class))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class)
- .build())
+ .mailet(VacationMailet.class))
.addMailet(MailetConfiguration.builder()
.mailet(SMIMESign.class)
.matcher(SenderIsLocal.class)
.addProperty("keyStoreFileName", temporaryFolder.getRoot().getAbsoluteFile().getAbsolutePath() + "/conf/smime.p12")
.addProperty("keyStorePassword", "secret")
.addProperty("keyStoreType", "PKCS12")
- .addProperty("debug", "true")
- .build())
+ .addProperty("debug", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(LocalDelivery.class)
- .build())
+ .mailet(LocalDelivery.class))
.addMailet(MailetConfiguration.builder()
.matcher(SMTPAuthSuccessful.class)
.mailet(RemoteDelivery.class)
@@ -133,14 +126,11 @@ public class SMIMESignIntegrationTest {
.addProperty("maxDnsProblemRetries", "0")
.addProperty("deliveryThreads", "10")
.addProperty("sendpartial", "true")
- .addProperty("bounceProcessor", "bounces")
- .build())
+ .addProperty("bounceProcessor", "bounces"))
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "relay-denied")
- .build())
- .build())
+ .addProperty("processor", "relay-denied")))
.addProcessor(CommonProcessors.spam())
.addProcessor(CommonProcessors.localAddressError())
.addProcessor(CommonProcessors.relayDenied())
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/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 294c4e8..a91ee69 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
@@ -23,8 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
-import javax.mail.internet.MimeMessage;
-
import org.apache.james.core.MailAddress;
import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -155,18 +153,15 @@ public class AmqpForwardAttachmentTest {
@Test
public void stripAttachmentShouldPutAttachmentsInMailAttributeWhenConfiguredForIt() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
MimeMessageBuilder.bodyPartBuilder()
.data(TEST_ATTACHMENT_CONTENT)
.disposition("attachment")
- .filename("test.txt")
- .build())
- .setSubject("test")
- .build();
+ .filename("test.txt"))
+ .setSubject("test");
Mail mail = FakeMail.builder()
.mimeMessage(message)
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/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 560d633..d258675 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
@@ -23,8 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
-import javax.mail.internet.MimeMessage;
-
import org.apache.james.core.MailAddress;
import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailets.TemporaryJamesServer;
@@ -134,14 +132,13 @@ public class ContactExtractorTest {
@Test
public void recipientsShouldBePublishedToAmqpWhenSendingEmail() throws Exception {
- MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder message = MimeMessageBuilder.mimeMessageBuilder()
.setSender(SENDER)
.addToRecipient(TO, "John To2 <" + TO2 + ">")
.addCcRecipient(CC, "John Cc2 <" + CC2 + ">")
.addBccRecipient(BCC, "John Bcc2 <" + BCC2 + ">")
.setSubject("Contact collection Rocks")
- .setText("This is my email")
- .build();
+ .setText("This is my email");
FakeMail mail = FakeMail.builder()
.mimeMessage(message)
.sender(new MailAddress(SENDER))
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/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 cc9c98d..217a721 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
@@ -531,26 +531,22 @@ public class ICSAttachmentWorkflowTest {
messageWithoutICSAttached = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
MimeMessageBuilder.bodyPartBuilder()
.data("My attachment")
.filename("test.txt")
- .disposition("attachment")
- .build())
+ .disposition("attachment"))
.setSubject("test")
.build();
messageWithICSAttached = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
MimeMessageBuilder.bodyPartBuilder()
.data(ICS_1.getBytes(StandardCharsets.UTF_8))
.filename("meeting.ics")
- .disposition("attachment")
- .build())
+ .disposition("attachment"))
.setSubject("test")
.build();
@@ -568,23 +564,19 @@ public class ICSAttachmentWorkflowTest {
messageWithThreeICSAttached = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
MimeMessageBuilder.bodyPartBuilder()
.data(ICS_1.getBytes(StandardCharsets.UTF_8))
.filename("test1.txt")
- .disposition("attachment")
- .build(),
+ .disposition("attachment"),
MimeMessageBuilder.bodyPartBuilder()
.data(ICS_2.getBytes(StandardCharsets.UTF_8))
.filename("test2.txt")
- .disposition("attachment")
- .build(),
+ .disposition("attachment"),
MimeMessageBuilder.bodyPartBuilder()
.data(ICS_3.getBytes(StandardCharsets.UTF_8))
.filename("test3.txt")
- .disposition("attachment")
- .build())
+ .disposition("attachment"))
.setSubject("test")
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/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 f32fb0c..8ad3299 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
@@ -138,18 +138,15 @@ public class StripAttachmentTest {
MimeMessage message = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("simple text")
- .build(),
+ .data("simple text"),
MimeMessageBuilder.bodyPartBuilder()
.data("Not matching attachment")
.filename("not_matching.tmp")
- .disposition("attachment")
- .build(),
+ .disposition("attachment"),
MimeMessageBuilder.bodyPartBuilder()
.data("Matching attachment")
.filename("temp.zip")
- .disposition("attachment")
- .build())
+ .disposition("attachment"))
.setSubject("test")
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
index b9ac01d..dde9d3f 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
@@ -135,9 +135,7 @@ public class LocalDeliveryTest {
.data("toto")
.disposition(MimeBodyPart.ATTACHMENT)
.filename("file.txt")
- .addHeader("Content-Type", "application/sieve; charset=UTF-8")
- .build())
- .build())
+ .addHeader("Content-Type", "application/sieve; charset=UTF-8")))
.state(Mail.DEFAULT)
.recipient(new MailAddress("receiver@domain.com"))
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java
index 547ae9b..fb7bb57 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java
@@ -31,11 +31,10 @@ import java.util.Collection;
import java.util.List;
import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
import org.apache.commons.io.IOUtils;
-import org.apache.mailet.Mail;
import org.apache.james.core.MailAddress;
+import org.apache.mailet.Mail;
import org.apache.mailet.PerRecipientHeaders.Header;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.RFC2822Headers;
@@ -133,12 +132,10 @@ public class MailDispatcherTest {
.when(mailStore)
.storeMail(any(MailAddress.class), any(Mail.class));
- MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
+ MimeMessageBuilder mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("toto")
- .build())
- .build();
+ .data("toto"));
FakeMail mail = FakeMail.builder()
.sender(MailAddressFixture.OTHER_AT_JAMES)
@@ -311,8 +308,7 @@ public class MailDispatcherTest {
.sender(MailAddressFixture.OTHER_AT_JAMES)
.recipients(MailAddressFixture.ANY_AT_JAMES, MailAddressFixture.ANY_AT_JAMES2)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(TEST_HEADER_NAME, headerValue)
- .build())
+ .addHeader(TEST_HEADER_NAME, headerValue))
.state("state")
.build();
mail.addSpecificHeaderForRecipient(TEST_HEADER_USER1, MailAddressFixture.ANY_AT_JAMES);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
index 166ab55..363721c 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
@@ -33,7 +33,6 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MessageResultIterator;
-import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.After;
import org.junit.Before;
@@ -60,13 +59,12 @@ public class MailboxAppenderTest {
mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("toto")
- .build())
+ .data("toto"))
.build();
integrationResources = new InMemoryIntegrationResources();
integrationResources.init();
- mailboxManager = new ManagerTestResources<StoreMailboxManager>(integrationResources).getMailboxManager();
+ mailboxManager = new ManagerTestResources<>(integrationResources).getMailboxManager();
testee = new MailboxAppender(mailboxManager);
session = mailboxManager.createSystemSession("TEST");
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
index 1d8736d..8ead6a7 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
@@ -961,9 +961,7 @@ public class SieveIntegrationTest {
.data("A text to match")
.addHeader("Content-Type", "text/plain; charset=UTF-8")
.filename("file.txt")
- .disposition(MimeBodyPart.ATTACHMENT)
- .build())
- .build())
+ .disposition(MimeBodyPart.ATTACHMENT)))
.state(Mail.DEFAULT)
.recipient(new MailAddress(RECEIVER_DOMAIN_COM))
.sender(new MailAddress("sender@any.com"))
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java
index 32a3844..ae2972c 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java
@@ -27,10 +27,10 @@ import static org.mockito.Mockito.when;
import javax.mail.internet.MimeMessage;
+import org.apache.james.core.MailAddress;
import org.apache.james.metrics.api.Metric;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MimeMessageBuilder;
@@ -59,8 +59,7 @@ public class SimpleMailStoreTest {
mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setMultipartWithBodyParts(
MimeMessageBuilder.bodyPartBuilder()
- .data("toto")
- .build())
+ .data("toto"))
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
index 6222bdf..3ee7c81 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
@@ -197,9 +197,7 @@ public class ToRecipientFolderTest {
.data("toto")
.disposition(MimeBodyPart.ATTACHMENT)
.filename("file.txt")
- .addHeader("Content-Type", "application/sieve; charset=UTF-8")
- .build())
- .build())
+ .addHeader("Content-Type", "application/sieve; charset=UTF-8")))
.state(Mail.DEFAULT)
.recipient(new MailAddress("receiver@domain.com"))
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0df7c31b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
index 516be1c..c4afffa 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
@@ -37,6 +37,7 @@ import javax.mail.internet.MimeMessage.RecipientType;
import javax.mail.internet.MimeMultipart;
import org.apache.commons.io.IOUtils;
+import org.apache.james.core.MailAddress;
import org.apache.james.managesieve.api.SieveParser;
import org.apache.james.managesieve.api.SyntaxException;
import org.apache.james.sieverepository.api.ScriptSummary;
@@ -44,7 +45,6 @@ import org.apache.james.sieverepository.api.SieveRepository;
import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
import org.apache.james.user.api.UsersRepository;
import org.apache.mailet.Mail;
-import org.apache.james.core.MailAddress;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMailetConfig;
@@ -505,8 +505,7 @@ public class ManageSieveMailetTestCase {
.data(scriptContent)
.disposition(MimeBodyPart.ATTACHMENT)
.filename(SCRIPT_NAME)
- .addHeader("Content-Type", "application/sieve; charset=UTF-8")
- .build())
+ .addHeader("Content-Type", "application/sieve; charset=UTF-8"))
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[08/44] james-project git commit: JAMES-2267 Avoid launching a JMAP
server where it can be avoided
Posted by bt...@apache.org.
JAMES-2267 Avoid launching a JMAP server where it can be avoided
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a537bce1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a537bce1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a537bce1
Branch: refs/heads/improve-mailet-testing-experience-v1
Commit: a537bce165c7988a9d2331d09585d20daffa7d5c
Parents: 623620e
Author: benwa <bt...@linagora.com>
Authored: Tue Dec 19 11:31:26 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 5 09:13:51 2018 +0700
----------------------------------------------------------------------
.../james/mailets/BounceIntegrationTest.java | 34 +++++++++++++-------
.../crypto/SMIMEDecryptIntegrationTest.java | 6 ++--
.../crypto/SMIMESignIntegrationTest.java | 6 ++--
.../mailets/AmqpForwardAttachmentTest.java | 9 +++---
.../transport/mailets/ContactExtractorTest.java | 9 +++---
.../mailets/ICSAttachmentWorkflowTest.java | 9 +++---
.../transport/mailets/StripAttachmentTest.java | 9 +++---
7 files changed, 42 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537bce1/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index c92dd50..5c65644 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
@@ -19,7 +19,7 @@
package org.apache.james.mailets;
-import org.apache.james.jmap.mailet.VacationMailet;
+import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.configuration.CommonProcessors;
import org.apache.james.mailets.configuration.MailetConfiguration;
@@ -37,7 +37,6 @@ import org.apache.james.transport.mailets.Resend;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIs;
-import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
@@ -88,7 +87,9 @@ public class BounceIntegrationTest {
@Test
public void dsnBounceMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder,
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder,
generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(DSNBounce.class)
@@ -110,7 +111,9 @@ public class BounceIntegrationTest {
@Test
public void bounceMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder,
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder,
generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Bounce.class)
@@ -132,7 +135,9 @@ public class BounceIntegrationTest {
@Test
public void forwardMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder,
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder,
generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Forward.class)
@@ -155,7 +160,9 @@ public class BounceIntegrationTest {
@Test
public void redirectMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder,
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder,
generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Redirect.class)
@@ -178,7 +185,9 @@ public class BounceIntegrationTest {
@Test
public void resendMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder,
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder,
generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Resend.class)
@@ -201,7 +210,9 @@ public class BounceIntegrationTest {
@Test
public void notifySenderMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder,
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder,
generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(NotifySender.class)
@@ -223,7 +234,9 @@ public class BounceIntegrationTest {
@Test
public void notifyPostmasterMailetShouldDeliverBounce() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder,
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder,
generateMailetContainerConfiguration(MailetConfiguration.builder()
.matcher(All.class)
.mailet(NotifyPostmaster.class)
@@ -259,9 +272,6 @@ public class BounceIntegrationTest {
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
.matcher(RecipientIs.class)
.matcherCondition(BOUNCE_RECEIVER)
.mailet(LocalDelivery.class))
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537bce1/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 7739eaf..7ed510e 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
@@ -25,7 +25,7 @@ import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
import org.apache.commons.io.IOUtils;
-import org.apache.james.jmap.mailet.VacationMailet;
+import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -86,13 +86,11 @@ public class SMIMEDecryptIntegrationTest {
.addProperty("debug", "true"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class)))
.build();
jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
.build(temporaryFolder, mailetContainer);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537bce1/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 a6c3208..f9ef2dc 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
@@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.time.ZonedDateTime;
-import org.apache.james.jmap.mailet.VacationMailet;
+import org.apache.james.MemoryJamesServerMain;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -98,9 +98,6 @@ public class SMIMESignIntegrationTest {
.matcher(All.class)
.mailet(RecipientRewriteTable.class))
.addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
.mailet(SMIMESign.class)
.matcher(SenderIsLocal.class)
.addProperty("keyStoreFileName", temporaryFolder.getRoot().getAbsoluteFile().getAbsolutePath() + "/conf/smime.p12")
@@ -132,6 +129,7 @@ public class SMIMESignIntegrationTest {
.build();
jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
.build(temporaryFolder, mailetContainer);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537bce1/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 0d4597b..538c037 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
@@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
+import org.apache.james.MemoryJamesServerMain;
import org.apache.james.core.MailAddress;
-import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -111,13 +111,12 @@ public class AmqpForwardAttachmentTest {
.addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class)))
.build();
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder, mailetContainer);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with()
.pollInterval(slowPacedPollInterval)
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537bce1/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 cdbc936..f7ba334 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
@@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
+import org.apache.james.MemoryJamesServerMain;
import org.apache.james.core.MailAddress;
-import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
import org.apache.james.mailets.configuration.MailetConfiguration;
@@ -96,12 +96,11 @@ public class ContactExtractorTest {
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class)))
.build();
- jamesServer = TemporaryJamesServer.builder().build(folder, mailets);
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(folder, mailets);
DataProbeImpl probe = jamesServer.getProbe(DataProbeImpl.class);
probe.addDomain(JAMES_ORG);
probe.addUser(SENDER, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537bce1/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 c6be395..f6bd7ed 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
@@ -26,9 +26,9 @@ import java.util.Optional;
import javax.mail.internet.MimeMessage;
+import org.apache.james.MemoryJamesServerMain;
import org.apache.james.core.MailAddress;
import org.apache.james.jmap.mailet.TextCalendarBodyToAttachment;
-import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -495,13 +495,12 @@ public class ICSAttachmentWorkflowTest {
.addProperty("routing_key", ROUTING_KEY))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class)))
.build();
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder, mailetContainer);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537bce1/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 15b7bff..2419288 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
@@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
+import org.apache.james.MemoryJamesServerMain;
import org.apache.james.core.MailAddress;
-import org.apache.james.jmap.mailet.VacationMailet;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.CommonProcessors;
@@ -92,13 +92,12 @@ public class StripAttachmentTest {
.addProperty("attribute", "my.attribute"))
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
- .mailet(VacationMailet.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
.mailet(LocalDelivery.class)))
.build();
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder, mailetContainer);
+ jamesServer = TemporaryJamesServer.builder()
+ .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
+ .build(temporaryFolder, mailetContainer);
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
calmlyAwait = Awaitility.with().pollInterval(slowPacedPollInterval).and().with().pollDelay(slowPacedPollInterval).await();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[14/44] james-project git commit: JAMES-2267 Factorize mailet
integration common constants
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 7c2fd11..c4c5ae7 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,7 +21,12 @@ package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
import static com.jayway.restassured.RestAssured.with;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -66,11 +71,6 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.specification.RequestSpecification;
public class GroupMappingTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
private static final String DOMAIN1 = "domain1.com";
private static final String DOMAIN2 = "domain2.com";
@@ -98,6 +98,8 @@ public class GroupMappingTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
private InetAddress containerIp;
@Before
@@ -183,17 +185,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@Test
@@ -206,16 +206,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@Test
@@ -230,20 +229,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -258,16 +256,15 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
- assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::hasAMessage);
+ assertThat(imapMessageReader.readFirstMessage()).contains(MESSAGE_CONTENT);
}
@Test
@@ -284,15 +281,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -305,15 +301,14 @@ public class GroupMappingTest {
.recipients(new MailAddress(GROUP_ON_DOMAIN1), new MailAddress(USER_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -330,20 +325,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN2))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -362,20 +356,19 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -390,15 +383,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -413,15 +405,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX);
- calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX);
+ calmlyAwait.atMost(ONE_MINUTE).until(imapMessageReader::userDoesNotReceiveMessage);
}
@Test
@@ -436,15 +427,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -459,15 +449,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(groupWithSlash))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN1, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN1, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -483,15 +472,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(userWithSlash, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(userWithSlash, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -506,15 +494,14 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1)) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
- imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
- .login(USER_DOMAIN2, PASSWORD)
- .select(IMAPMessageReader.INBOX)
- .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
- }
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(USER_DOMAIN2, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(calmlyAwait.atMost(ONE_MINUTE));
}
@Test
@@ -528,28 +515,27 @@ public class GroupMappingTest {
.recipient(new MailAddress(GROUP_ON_DOMAIN1))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN1);) {
- messageSender.sendMessage(mail)
- .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
-
- calmlyAwait.atMost(1, TimeUnit.MINUTES)
- .until(() -> {
- try {
- with()
- .baseUri("http://" + containerIp.getHostAddress())
- .port(80)
- .get("/api/email")
- .then()
- .statusCode(200)
- .body("[0].from", equalTo(SENDER))
- .body("[0].to[0]", equalTo(externalMail))
- .body("[0].text", equalTo(MESSAGE_CONTENT));
-
- return true;
- } catch(AssertionError e) {
- return false;
- }
- });
- }
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(mail)
+ .awaitSent(calmlyAwait.atMost(ONE_MINUTE));
+
+ calmlyAwait.atMost(1, TimeUnit.MINUTES)
+ .until(() -> {
+ try {
+ with()
+ .baseUri("http://" + containerIp.getHostAddress())
+ .port(80)
+ .get("/api/email")
+ .then()
+ .statusCode(200)
+ .body("[0].from", equalTo(SENDER))
+ .body("[0].to[0]", equalTo(externalMail))
+ .body("[0].text", equalTo(MESSAGE_CONTENT));
+
+ return true;
+ } catch(AssertionError e) {
+ return false;
+ }
+ });
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 799f210..fddaca5 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,7 +20,12 @@
package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import java.nio.charset.StandardCharsets;
@@ -64,16 +69,8 @@ import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Option;
public class ICSAttachmentWorkflowTest {
-
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
-
- private static final String FROM = "fromUser@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
private static final String MAIL_ATTRIBUTE = "ical.attachments";
private static final String PARSED_ICAL_MAIL_ATTRIBUTE = "ical.parsed";
@@ -503,7 +500,7 @@ public class ICSAttachmentWorkflowTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
@@ -574,7 +571,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -595,7 +592,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -632,7 +629,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -658,7 +655,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -683,7 +680,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -708,7 +705,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -738,7 +735,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -769,7 +766,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -794,7 +791,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
@@ -836,7 +833,7 @@ public class ICSAttachmentWorkflowTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
http://git-wip-us.apache.org/repos/asf/james-project/blob/9e639adb/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 07ebb67..7849834 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,7 +20,12 @@
package org.apache.james.transport.mailets;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.apache.james.mailets.configuration.AwaitUtils.calmlyAwait;
+import static org.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.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
@@ -50,16 +55,8 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class StripAttachmentTest {
-
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int IMAP_PORT = 1143;
- private static final int SMTP_PORT = 1025;
- private static final String PASSWORD = "secret";
-
- private static final String JAMES_APACHE_ORG = "james.org";
-
- private static final String FROM = "fromUser@" + JAMES_APACHE_ORG;
- private static final String RECIPIENT = "touser@" + JAMES_APACHE_ORG;
+ private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -99,7 +96,7 @@ public class StripAttachmentTest {
.build(temporaryFolder);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(JAMES_APACHE_ORG);
+ dataProbe.addDomain(DEFAULT_DOMAIN);
dataProbe.addUser(FROM, PASSWORD);
dataProbe.addUser(RECIPIENT, PASSWORD);
jamesServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, RECIPIENT, "INBOX");
@@ -139,7 +136,7 @@ public class StripAttachmentTest {
.recipient(new MailAddress(RECIPIENT))
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, JAMES_APACHE_ORG)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DEFAULT_DOMAIN)) {
messageSender.sendMessage(mail)
.awaitSent(calmlyAwait.atMost(ONE_MINUTE));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org