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:32 UTC
[13/44] james-project git commit: JAMES-2267 Temporary James server
should accept SmtpConfiguration builders
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