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 ro...@apache.org on 2019/07/25 16:18:51 UTC
[james-project] branch master updated: JAMES-2845 Fix usage of
TemporaryFolder in tests
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 86b68a0 JAMES-2845 Fix usage of TemporaryFolder in tests
new 8fed6eb Merge remote-tracking branch 'mbaechler/use-temporary-folder-correctly'
86b68a0 is described below
commit 86b68a03bb8f642bfb53a0a1061a30d86ca90161
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Jul 23 17:29:31 2019 +0200
JAMES-2845 Fix usage of TemporaryFolder in tests
---
.../james/mailets/AddDeliveredToHeaderTest.java | 2 +-
.../james/mailets/BounceIntegrationTest.java | 14 ++++----
.../mailets/CommonMailetConfigurationTest.java | 2 +-
.../apache/james/mailets/DKIMIntegrationTest.java | 2 +-
...ectResolutionRemoteDeliveryIntegrationTest.java | 8 ++---
.../GatewayRemoteDeliveryIntegrationTest.java | 14 ++++----
.../org/apache/james/mailets/MailetErrorsTest.java | 36 ++++++++++----------
.../mailets/NetworkMatcherIntegrationTest.java | 2 +-
.../RecipientRewriteTableIntegrationTest.java | 2 +-
.../org/apache/james/mailets/SieveDelivery.java | 2 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 2 +-
.../apache/james/mailets/TemporaryJamesServer.java | 38 +++++++++++++---------
.../crypto/SMIMEDecryptIntegrationTest.java | 6 ++--
.../mailets/crypto/SMIMESignIntegrationTest.java | 6 ++--
.../james/smtp/SmtpAuthorizedAddressesTest.java | 2 +-
.../james/smtp/SmtpBracketEnforcementTest.java | 2 +-
.../org/apache/james/smtp/SmtpContentTypeTest.java | 3 +-
.../james/smtp/SmtpIdentityVerificationTest.java | 2 +-
.../org/apache/james/smtp/SmtpNullSenderTest.java | 2 +-
.../apache/james/smtp/SmtpRandomStoringTest.java | 2 +-
.../apache/james/smtp/SmtpSizeLimitationTest.java | 2 +-
.../james/transport/mailets/AddFooterTest.java | 2 +-
.../james/transport/mailets/AliasMappingTest.java | 2 +-
.../mailets/AmqpForwardAttachmentTest.java | 2 +-
.../transport/mailets/ContactExtractorTest.java | 2 +-
.../transport/mailets/DlpIntegrationTest.java | 2 +-
.../james/transport/mailets/DomainMappingTest.java | 2 +-
.../transport/mailets/GroupMappingRelayTest.java | 2 +-
.../james/transport/mailets/GroupMappingTest.java | 2 +-
.../mailets/ICSAttachmentWorkflowTest.java | 2 +-
.../transport/mailets/IsOverQuotaMatcherTest.java | 2 +-
.../mailets/MailReprocessingIntegrationTest.java | 2 +-
.../james/transport/mailets/SpamAssassinTest.java | 2 +-
.../transport/mailets/StripAttachmentTest.java | 2 +-
.../james/transport/mailets/ToRepositoryTest.java | 2 +-
.../mailets/ToSenderDomainRepositoryTest.java | 2 +-
36 files changed, 95 insertions(+), 86 deletions(-)
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 795ca91..e5a496f 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
@@ -52,7 +52,7 @@ public class AddDeliveredToHeaderTest {
@Before
public void setup() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 0dfc134..c637cf4 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
@@ -78,7 +78,7 @@ public class BounceIntegrationTest {
.matcher(All.class)
.mailet(DSNBounce.class)
.addProperty("passThrough", "false")))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -103,7 +103,7 @@ public class BounceIntegrationTest {
.matcher(All.class)
.mailet(Bounce.class)
.addProperty("passThrough", "false")))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -128,7 +128,7 @@ public class BounceIntegrationTest {
.mailet(Forward.class)
.addProperty("forwardTo", BOUNCE_RECEIVER)
.addProperty("passThrough", "false")))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -154,7 +154,7 @@ public class BounceIntegrationTest {
.mailet(Redirect.class)
.addProperty("recipients", BOUNCE_RECEIVER)
.addProperty("passThrough", "false")))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -180,7 +180,7 @@ public class BounceIntegrationTest {
.mailet(Resend.class)
.addProperty("recipients", BOUNCE_RECEIVER)
.addProperty("passThrough", "false")))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -205,7 +205,7 @@ public class BounceIntegrationTest {
.matcher(All.class)
.mailet(NotifySender.class)
.addProperty("passThrough", "false")))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -230,7 +230,7 @@ public class BounceIntegrationTest {
.matcher(All.class)
.mailet(NotifyPostmaster.class)
.addProperty("passThrough", "false")))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 3728b08..e05707b 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
@@ -50,7 +50,7 @@ public class CommonMailetConfigurationTest {
@Before
public void setup() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java
index 6d3aa31..7c702e7 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java
@@ -125,7 +125,7 @@ public class DKIMIntegrationTest {
.withBase(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.withOverrides(binder -> binder.bind(PublicKeyRecordRetriever.class).toInstance(MOCK_PUBLIC_KEY_RECORD_RETRIEVER))
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
index 2508961..964f41a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
@@ -101,7 +101,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
.putProcessor(CommonProcessors.error())
.putProcessor(directResolutionTransport())
.putProcessor(CommonProcessors.bounces()))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -129,7 +129,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
.putProcessor(CommonProcessors.error())
.putProcessor(directResolutionTransport())
.putProcessor(CommonProcessors.bounces()))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -155,7 +155,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
.putProcessor(CommonProcessors.error())
.putProcessor(transport())
.putProcessor(CommonProcessors.bounces()))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -183,7 +183,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
.putProcessor(CommonProcessors.error())
.putProcessor(transport())
.putProcessor(CommonProcessors.bounces()))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 91805a4..b8ce35f 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
@@ -89,7 +89,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -109,7 +109,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -128,7 +128,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -148,7 +148,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -169,7 +169,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -194,7 +194,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
.withMailetContainer(generateMailetContainerConfiguration(gatewayProperty))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
@@ -223,7 +223,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
.addMailet(MailetConfiguration.remoteDeliveryBuilderNoBounces()
.matcher(All.class)
.addProperty("gateway", gatewayProperty))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 5657b01..e78e3bd 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
@@ -77,7 +77,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ErrorMailet.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -96,7 +96,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RuntimeErrorMailet.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -117,7 +117,7 @@ public class MailetErrorsTest {
.matcher(All.class)
.mailet(ErrorMailet.class)
.addProperty("onMailetException", CUSTOM_PROCESSOR))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -139,7 +139,7 @@ public class MailetErrorsTest {
.matcher(All.class)
.mailet(RuntimeErrorMailet.class)
.addProperty("onMailetException", CUSTOM_PROCESSOR))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -164,7 +164,7 @@ public class MailetErrorsTest {
.matcher(All.class)
.mailet(ToRepository.class)
.addProperty("repositoryPath", CUSTOM_REPOSITORY.asString()))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -189,7 +189,7 @@ public class MailetErrorsTest {
.matcher(All.class)
.mailet(ToRepository.class)
.addProperty("repositoryPath", CUSTOM_REPOSITORY.asString()))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -208,7 +208,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(ErrorMatcher.class)
.mailet(NoopMailet.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -227,7 +227,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(RuntimeErrorMatcher.class)
.mailet(NoopMailet.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -248,7 +248,7 @@ public class MailetErrorsTest {
.matcher(ErrorMatcher.class)
.mailet(NoopMailet.class)
.addProperty("onMatchException", CUSTOM_PROCESSOR))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -269,7 +269,7 @@ public class MailetErrorsTest {
.matcher(RuntimeErrorMatcher.class)
.mailet(NoopMailet.class)
.addProperty("onMatchException", CUSTOM_PROCESSOR))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -294,7 +294,7 @@ public class MailetErrorsTest {
.matcher(All.class)
.mailet(ToRepository.class)
.addProperty("repositoryPath", CUSTOM_REPOSITORY.asString()))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -319,7 +319,7 @@ public class MailetErrorsTest {
.matcher(All.class)
.mailet(ToRepository.class)
.addProperty("repositoryPath", CUSTOM_REPOSITORY.asString()))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -344,7 +344,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Null.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -369,7 +369,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Null.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -398,7 +398,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(ErrorMatcher.class)
.mailet(Null.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -427,7 +427,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(RuntimeErrorMatcher.class)
.mailet(Null.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -456,7 +456,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ErrorMailet.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
@@ -485,7 +485,7 @@ public class MailetErrorsTest {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(RuntimeErrorMailet.class))))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
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 776d0ee..f372d05 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(TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
.putProcessor(rootProcessor)
.putProcessor(CommonProcessors.deliverOnlyTransport()))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = temporaryJamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 0a12f0a..0b582bd 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
@@ -70,7 +70,7 @@ public class RecipientRewriteTableIntegrationTest {
@Before
public void setup() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 0b68e56..aad0215 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
@@ -55,7 +55,7 @@ public class SieveDelivery {
@Before
public void setup() throws Exception {
- jamesServer = TemporaryJamesServer.builder().build(temporaryFolder);
+ jamesServer = TemporaryJamesServer.builder().build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 72a3c9b..b51eb40 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
@@ -79,7 +79,7 @@ public class SmtpAuthIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 f940a29..796f7b8 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
@@ -44,7 +44,6 @@ import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.server.core.configuration.Configuration;
import org.apache.james.utils.GuiceProbe;
import org.apache.james.webadmin.WebAdminConfiguration;
-import org.junit.rules.TemporaryFolder;
import com.google.common.collect.ImmutableList;
import com.google.inject.Module;
@@ -104,9 +103,9 @@ public class TemporaryJamesServer {
return this;
}
- public TemporaryJamesServer build(TemporaryFolder temporaryFolder) throws Exception {
+ public TemporaryJamesServer build(File workingDir) throws Exception {
return new TemporaryJamesServer(
- temporaryFolder,
+ workingDir,
mailetConfiguration.orElse(DEFAULT_MAILET_CONTAINER_CONFIGURATION.build()),
smtpConfiguration.orElse(SmtpConfiguration.DEFAULT),
module.orElse(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE),
@@ -137,14 +136,13 @@ public class TemporaryJamesServer {
private final GuiceJamesServer jamesServer;
- private TemporaryJamesServer(TemporaryFolder temporaryFolder, MailetContainer mailetContainer, SmtpConfiguration smtpConfiguration,
+ private TemporaryJamesServer(File workingDir, MailetContainer mailetContainer, SmtpConfiguration smtpConfiguration,
Module serverBaseModule, List<Module> additionalModules) throws Exception {
- appendMailetConfigurations(temporaryFolder, mailetContainer);
- appendSmtpConfigurations(temporaryFolder, smtpConfiguration);
+ appendMailetConfigurations(workingDir, mailetContainer);
+ appendSmtpConfigurations(workingDir, smtpConfiguration);
- String workingDir = temporaryFolder.getRoot().getAbsolutePath();
Configuration configuration = Configuration.builder().workingDirectory(workingDir).build();
- copyResources(Paths.get(workingDir, "conf"));
+ copyResources(Paths.get(workingDir.getAbsolutePath(), "conf"));
jamesServer = GuiceJamesServer.forConfiguration(configuration)
.combineWith(serverBaseModule)
@@ -170,28 +168,36 @@ public class TemporaryJamesServer {
}
}
- private void appendMailetConfigurations(TemporaryFolder temporaryFolder, MailetContainer mailetContainer) throws ConfigurationException, IOException {
- try (OutputStream outputStream = createMailetConfigurationFile(temporaryFolder)) {
+ private void appendMailetConfigurations(File workingDir, MailetContainer mailetContainer) throws ConfigurationException, IOException {
+ try (OutputStream outputStream = createMailetConfigurationFile(workingDir)) {
IOUtils.write(mailetContainer.serializeAsXml(), outputStream, StandardCharsets.UTF_8);
}
}
- private void appendSmtpConfigurations(TemporaryFolder temporaryFolder, SmtpConfiguration smtpConfiguration) throws ConfigurationException, IOException {
- try (OutputStream outputStream = createSmtpConfigurationFile(temporaryFolder)) {
+ private void appendSmtpConfigurations(File workingDir, SmtpConfiguration smtpConfiguration) throws ConfigurationException, IOException {
+ try (OutputStream outputStream = createSmtpConfigurationFile(workingDir)) {
IOUtils.write(smtpConfiguration.serializeAsXml(), outputStream, StandardCharsets.UTF_8);
}
}
- private FileOutputStream createMailetConfigurationFile(TemporaryFolder temporaryFolder) throws IOException {
- File configurationFolder = temporaryFolder.newFolder("conf");
+ private FileOutputStream createMailetConfigurationFile(File workingDir) throws IOException {
+ File configurationFolder = confDirectory(workingDir);
return new FileOutputStream(Paths.get(configurationFolder.getAbsolutePath(), MAILETCONTAINER_CONFIGURATION_FILENAME).toFile());
}
- private FileOutputStream createSmtpConfigurationFile(TemporaryFolder temporaryFolder) throws IOException {
- File configurationFolder = temporaryFolder.getRoot().listFiles()[0];
+ private FileOutputStream createSmtpConfigurationFile(File workingDir) throws IOException {
+ File configurationFolder = confDirectory(workingDir);
return new FileOutputStream(Paths.get(configurationFolder.getAbsolutePath(), SMTP_CONFIGURATION_FILENAME).toFile());
}
+ private File confDirectory(File workingDir) {
+ File configurationFolder = workingDir.toPath().resolve("conf").toFile();
+ if (!configurationFolder.exists()) {
+ configurationFolder.mkdir();
+ }
+ return configurationFolder;
+ }
+
public void shutdown() {
jamesServer.stop();
}
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 5c35a48..d8520c2 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
@@ -24,6 +24,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.File;
import java.time.ZonedDateTime;
import org.apache.james.MemoryJamesServerMain;
@@ -63,6 +64,7 @@ public class SMIMEDecryptIntegrationTest {
@Before
public void setup() throws Exception {
+ File workingDir = temporaryFolder.newFolder();
MailetContainer mailetContainer = MailetContainer.builder()
.putProcessor(CommonProcessors.root())
.putProcessor(CommonProcessors.error())
@@ -71,7 +73,7 @@ public class SMIMEDecryptIntegrationTest {
.addMailet(MailetConfiguration.builder()
.mailet(SMIMEDecrypt.class)
.matcher(All.class)
- .addProperty("keyStoreFileName", temporaryFolder.getRoot().getAbsoluteFile().getAbsolutePath() + "/conf/smime.p12")
+ .addProperty("keyStoreFileName", workingDir.toPath().resolve("conf").resolve("smime.p12").toAbsolutePath().toString())
.addProperty("keyStorePassword", "secret")
.addProperty("keyStoreType", "PKCS12")
.addProperty("debug", "true"))
@@ -82,7 +84,7 @@ public class SMIMEDecryptIntegrationTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(workingDir);
jamesServer.getProbe(DataProbeImpl.class)
.fluent()
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 124c3f8..6d9f771 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
@@ -25,6 +25,7 @@ import static org.apache.james.mailets.configuration.Constants.PASSWORD;
import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.File;
import java.time.ZonedDateTime;
import org.apache.james.MemoryJamesServerMain;
@@ -67,6 +68,7 @@ public class SMIMESignIntegrationTest {
@Before
public void setup() throws Exception {
+ File workingDir = temporaryFolder.newFolder();
MailetContainer mailetContainer = MailetContainer.builder()
.putProcessor(CommonProcessors.root())
.putProcessor(CommonProcessors.error())
@@ -81,7 +83,7 @@ public class SMIMESignIntegrationTest {
.addMailet(MailetConfiguration.builder()
.mailet(SMIMESign.class)
.matcher(SenderIsLocal.class)
- .addProperty("keyStoreFileName", temporaryFolder.getRoot().getAbsoluteFile().getAbsolutePath() + "/conf/smime.p12")
+ .addProperty("keyStoreFileName", workingDir.toPath().resolve("conf").resolve("smime.p12").toAbsolutePath().toString())
.addProperty("keyStorePassword", "secret")
.addProperty("keyStoreType", "PKCS12")
.addProperty("debug", "true"))
@@ -92,7 +94,7 @@ public class SMIMESignIntegrationTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(() -> DATE_2015))
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(workingDir);
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 2480226..a59f7a8 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
@@ -79,7 +79,7 @@ public class SmtpAuthorizedAddressesTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withSmtpConfiguration(smtpConfiguration)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 03a1e9e..11a0764 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,7 +50,7 @@ public class SmtpBracketEnforcementTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withSmtpConfiguration(smtpConfiguration)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java
index f1dee17..cdec232 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java
@@ -48,7 +48,6 @@ import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.apache.mailet.Mail;
import org.junit.After;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -83,7 +82,7 @@ public class SmtpContentTypeTest {
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withSmtpConfiguration(smtpConfiguration)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 3faabe5..6cba403 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,7 +53,7 @@ public class SmtpIdentityVerificationTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withSmtpConfiguration(smtpConfiguration)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java
index e9dbeda..6ce5345 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpNullSenderTest.java
@@ -52,7 +52,7 @@ public class SmtpNullSenderTest {
@Before
public void setUp() throws Exception {
jamesServer = TemporaryJamesServer.builder()
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java
index 08b6ab5..b3d45e5 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java
@@ -127,7 +127,7 @@ public class SmtpRandomStoringTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
}
@After
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 9120eb3..00a3c67 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,7 +52,7 @@ public class SmtpSizeLimitationTest {
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withSmtpConfiguration(smtpConfiguration)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
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 b33fe70..98d94ad 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
@@ -70,7 +70,7 @@ public class AddFooterTest {
.mailet(AddFooter.class)
.addProperty("text", MATCH_ME))
.addMailetsFrom(CommonProcessors.transport())))
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java
index 595f938..1450c1a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java
@@ -97,7 +97,7 @@ public class AliasMappingTest {
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DOMAIN);
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 25c5f46..db0166e 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
@@ -106,7 +106,7 @@ public class AmqpForwardAttachmentTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataprobe = jamesServer.getProbe(DataProbeImpl.class);
dataprobe.addDomain(DEFAULT_DOMAIN);
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 37ff3d5..438440d 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
@@ -101,7 +101,7 @@ public class ContactExtractorTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailets)
- .build(folder);
+ .build(folder.newFolder());
jamesServer.getProbe(DataProbeImpl.class)
.fluent()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
index 5b8575b..9df98ff 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
@@ -81,7 +81,7 @@ public class DlpIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(Modules.combine(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE, MemoryJamesServerMain.WEBADMIN_TESTING))
.withMailetContainer(mailets)
- .build(folder);
+ .build(folder.newFolder());
jamesServer.getProbe(DataProbeImpl.class)
.fluent()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java
index 1a3eaff..4ea214a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java
@@ -83,7 +83,7 @@ public class DomainMappingTest {
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
jamesServer.getProbe(DataProbeImpl.class).fluent()
.addDomain(DOMAIN1)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
index c81e192..7c77a28 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
@@ -85,7 +85,7 @@ public class GroupMappingRelayTest {
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DOMAIN1);
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 a53d382..213a73f 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 {
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DOMAIN1);
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 c26afff..427893c 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
@@ -492,7 +492,7 @@ public class ICSAttachmentWorkflowTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
index 492133e..0e1c4b9 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
@@ -88,7 +88,7 @@ public class IsOverQuotaMatcherTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
webAdminApi = WebAdminUtils.spec(jamesServer.getProbe(WebAdminGuiceProbe.class).getWebAdminPort());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
index 429f777..b8e09eb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
@@ -87,7 +87,7 @@ public class MailReprocessingIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(Modules.combine(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE, MemoryJamesServerMain.WEBADMIN_TESTING))
.withMailetContainer(mailets)
- .build(folder);
+ .build(folder.newFolder());
jamesServer.getProbe(DataProbeImpl.class)
.fluent()
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 a52c59e..a4104b0 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
@@ -86,7 +86,7 @@ public class SpamAssassinTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailets)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
jamesServer.getProbe(DataProbeImpl.class)
.fluent()
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 5b7b590..43a3321 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
@@ -83,7 +83,7 @@ public class StripAttachmentTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
index 238711d..916446f 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
@@ -77,7 +77,7 @@ public class ToRepositoryTest {
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DEFAULT_DOMAIN);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
index aacc8b0..261ca30 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
@@ -201,7 +201,7 @@ public class ToSenderDomainRepositoryTest {
private void startJamesServerWithMailetContainer(MailetContainer.Builder mailetContainer) throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withMailetContainer(mailetContainer)
- .build(temporaryFolder);
+ .build(temporaryFolder.newFolder());
jamesServer.getProbe(DataProbeImpl.class)
.fluent()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org