This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0ee352c4ccd3 CAMEL-23317: Fix flaky mail tests caused by global
mailbox purging
0ee352c4ccd3 is described below
commit 0ee352c4ccd3ac29b0ea301049a55982f08ce9f4
Author: Aurélien Pupier <[email protected]>
AuthorDate: Thu Oct 8 14:16:31 2026 +0200
CAMEL-23317: Fix flaky mail tests caused by global mailbox purging
- Avoid global Mailbox.clearAll() which purged the shared singleton
GreenMail server across all users and tests
- Add Mailbox.clearAll(MailboxUser... users) and MailboxUser.clear() to
scope mailbox cleanup to specific test users
- Update all camel-mail tests to clear only their designated mailboxes
- Fix mock assertion awaiting and isolate user accounts in
MailProducerUnsupportedCharsetTest
- Ensure eager body conversion in MailAttachmentTest and
MailAttachmentDuplicateNamesTest to prevent premature POP3 message
expunge
Co-authored-by: IBM Bob 2.2.1
Signed-off-by: Aurélien Pupier <[email protected]>
---
.../mail/AdditionalMailPropertiesTest.java | 4 +--
.../camel/component/mail/AuthenticatorTest.java | 2 +-
.../camel/component/mail/FromFileSendMailTest.java | 2 +-
.../mail/MailAttachmentDuplicateNamesTest.java | 6 ++--
.../mail/MailAttachmentFileNameQuotingTest.java | 2 +-
.../component/mail/MailAttachmentNamesTest.java | 2 +-
.../mail/MailAttachmentPollEnrichTest.java | 2 +-
.../mail/MailAttachmentRedeliveryTest.java | 2 +-
.../camel/component/mail/MailAttachmentTest.java | 6 ++--
.../mail/MailAttachmentsUmlautIssueTest.java | 2 +-
.../component/mail/MailBatchConsumerTest.java | 2 +-
.../component/mail/MailCollectionHeaderTest.java | 2 +-
.../component/mail/MailCommitOnCompletionTest.java | 2 +-
.../mail/MailComponentRecipientSetTest.java | 2 +-
.../mail/MailContentTypeResolverTest.java | 2 +-
.../camel/component/mail/MailContentTypeTest.java | 6 ++--
.../camel/component/mail/MailConvertersTest.java | 2 +-
.../camel/component/mail/MailCopyToTest.java | 3 +-
.../component/mail/MailCustomContentTypeTest.java | 12 +++----
.../mail/MailDefaultDelayForMailConsumeTest.java | 2 +-
.../camel/component/mail/MailDisconnectTest.java | 2 +-
.../mail/MailDoNotDeleteIfProcessFailsTest.java | 2 +-
.../camel/component/mail/MailFetchSizeTest.java | 2 +-
.../component/mail/MailFetchSizeZeroTest.java | 2 +-
.../mail/MailHeaderOverrideOptionsTest.java | 2 +-
...aderOverrulePreConfigurationRecipientsTest.java | 2 +-
.../component/mail/MailHtmlAttachmentTest.java | 2 +-
.../MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../mail/MailIdempotentRepositoryTest.java | 2 +-
.../component/mail/MailMaxMessagesPerPollTest.java | 2 +-
.../camel/component/mail/MailMessageTest.java | 1 -
.../component/mail/MailMimeDecodeHeadersTest.java | 4 +--
.../camel/component/mail/MailMoveToTest.java | 4 ++-
.../component/mail/MailMultipleRecipientsTest.java | 4 +--
.../MailMultipleRecipientsUsingHeadersTest.java | 2 +-
.../mail/MailNameAndEmailInRecipientTest.java | 2 +-
.../component/mail/MailPollEnrichNoMailTest.java | 2 +-
.../camel/component/mail/MailPollEnrichTest.java | 2 +-
.../component/mail/MailPostProcessActionTest.java | 2 +-
.../mail/MailProcessOnlyUnseenMessagesTest.java | 2 +-
.../component/mail/MailProducerConcurrentTest.java | 2 +-
.../camel/component/mail/MailProducerTest.java | 4 +--
.../mail/MailProducerUnsupportedCharsetTest.java | 38 ++++++++++++----------
.../mail/MailRecipientsPipeIssueTest.java | 2 +-
.../camel/component/mail/MailRecipientsTest.java | 8 ++---
.../camel/component/mail/MailReplyToTest.java | 4 +--
.../apache/camel/component/mail/MailRouteTest.java | 4 +--
.../camel/component/mail/MailSearchTermTest.java | 2 +-
.../MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../mail/MailSearchTermUriConfigTest.java | 2 +-
.../mail/MailShutdownCompleteAllTasksTest.java | 2 +-
.../MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../camel/component/mail/MailSortTermTest.java | 2 +-
.../component/mail/MailSortTermThreeTest.java | 2 +-
.../camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../component/mail/MailSplitAttachmentsTest.java | 2 +-
.../camel/component/mail/MailSubjectTest.java | 2 +-
.../mail/MailToMultipleEndpointsTest.java | 2 +-
.../component/mail/MailUsernameWithAtSignTest.java | 2 +-
.../component/mail/MailUsingCustomSessionTest.java | 2 +-
.../camel/component/mail/MailUsingHeadersTest.java | 4 +--
.../component/mail/MailUsingOwnComponentTest.java | 2 +-
.../org/apache/camel/component/mail/Mailbox.java | 27 +++++++++++++++
.../component/mail/MimeMessageConsumeTest.java | 2 +-
.../mail/MimeMultipartAlternativeTest.java | 2 +-
...imeMultipartAlternativeWithContentTypeTest.java | 2 +-
...MultipartAlternativeWithLongerFilenameTest.java | 2 +-
.../mail/MultipleDestinationConsumeTest.java | 2 +-
.../mail/NestedMimeMessageConsumeTest.java | 2 +-
.../camel/component/mail/RawMailMessageTest.java | 2 +-
.../component/mail/SearchTermBuilderTest.java | 3 --
.../mail/SpringMailSplitAttachmentsTest.java | 2 +-
72 files changed, 141 insertions(+), 109 deletions(-)
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
index b754f2d96d13..ee3b283952ed 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
@@ -36,7 +36,7 @@ public class AdditionalMailPropertiesTest extends
CamelTestSupport {
@Test
public void testAdditionalMailProperties() {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(user);
MailEndpoint endpoint = context.getEndpoint(
user.uriPrefix(Protocol.pop3) +
"&mail.pop3.forgettopheaders=true&initialDelay=100&delay=100",
@@ -48,7 +48,7 @@ public class AdditionalMailPropertiesTest extends
CamelTestSupport {
@Test
public void testConsumeWithAdditionalProperties() throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(user);
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
index d31d40f78295..1a1d79a66a61 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
@@ -45,7 +45,7 @@ public class AuthenticatorTest extends CamelTestSupport {
*/
@Test
public void testSendAndReceiveMails() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james3, james4);
// first expect correct result because smtp authenticator does not
return wrong password
callAndCheck("mock:result");
// second expect exception because smtp authenticator does return
wrong password
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
index ac0f7bf5ae07..d317c34a5c7d 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
@@ -32,7 +32,7 @@ public class FromFileSendMailTest extends CamelTestSupport {
@Test
public void testSendFileAsMail() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(1);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
index ce3e9a164034..ac28ea331295 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
@@ -45,7 +45,7 @@ public class MailAttachmentDuplicateNamesTest extends
CamelTestSupport {
@Test
public void testSendAndReceiveMailWithAttachmentsWithDuplicateNames()
throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ james.clear();
// START SNIPPET: e1
@@ -97,7 +97,9 @@ public class MailAttachmentDuplicateNamesTest extends
CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(james.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100").to("mock:result");
+ from(james.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100")
+ .convertBodyTo(String.class)
+ .to("mock:result");
}
};
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentFileNameQuotingTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentFileNameQuotingTest.java
index e336315d8a59..aa79b1efd869 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentFileNameQuotingTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentFileNameQuotingTest.java
@@ -48,7 +48,7 @@ public class MailAttachmentFileNameQuotingTest extends
CamelTestSupport {
@Test
public void hostileAttachmentNameIsQuotedInTheContentTypeHeader() throws
Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
// create an exchange with a normal body and attachment to be produced
as email
Endpoint endpoint =
context.getEndpoint(james.uriPrefix(Protocol.smtp));
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
index 10a70aa41279..b51cfc925c9a 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
@@ -63,7 +63,7 @@ public class MailAttachmentNamesTest extends CamelTestSupport
{
@Override
protected void doPostSetup() {
- Mailbox.clearAll();
+ Mailbox.clearAll(james, default_, suffix);
resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
resultEndpoint.setResultWaitTime(TimeUnit.SECONDS.toMillis(5));
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
index bd034111aca8..719e2fec053c 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
@@ -47,7 +47,7 @@ public class MailAttachmentPollEnrichTest extends
CamelTestSupport {
@Test
public void testPollEnrichMailWithAttachments() throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
// START SNIPPET: e1
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index ec8738936485..633cb4592f30 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -50,7 +50,7 @@ public class MailAttachmentRedeliveryTest extends
CamelTestSupport {
@Test
public void testSendAndReceiveMailWithAttachmentsRedelivery() throws
Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
// create an exchange with a normal body and attachment to be produced
as email
Endpoint endpoint =
context.getEndpoint(james.uriPrefix(Protocol.smtp));
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
index 5d2f67b3f281..7de1e08ccbab 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
@@ -47,7 +47,7 @@ public class MailAttachmentTest extends CamelTestSupport {
@Test
public void testSendAndReceiveMailWithAttachments() throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ james.clear();
// START SNIPPET: e1
@@ -104,7 +104,9 @@ public class MailAttachmentTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(james.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100").to("mock:result");
+ from(james.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100")
+ .convertBodyTo(String.class)
+ .to("mock:result");
}
};
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
index 970b861f8ef6..b1dcc9b81242 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
@@ -51,7 +51,7 @@ public class MailAttachmentsUmlautIssueTest extends
CamelTestSupport {
@Test
public void testSendAndReceiveMailWithAttachments() throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
// create an exchange with a normal body and attachment to be produced
as email
Endpoint endpoint =
context.getEndpoint(james.uriPrefix(Protocol.smtp));
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
index e4f26ddc3304..d99021aa0dbe 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
@@ -69,7 +69,7 @@ public class MailBatchConsumerTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
index 0fc37275ab97..b17690efec06 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
@@ -34,7 +34,7 @@ public class MailCollectionHeaderTest extends
CamelTestSupport {
@Test
public void testMailHeaderWithCollection() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
String[] foo = new String[] { "Carlsberg", "Heineken" };
template.sendBodyAndHeader("direct:a", "Hello World", "beers", foo);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
index 6ac0d979cec2..68051e676f1c 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
@@ -62,7 +62,7 @@ public class MailCommitOnCompletionTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
index 77021a114e55..ae2d5ef2548f 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
@@ -36,7 +36,7 @@ public class MailComponentRecipientSetTest extends
CamelTestSupport {
@Test
public void testMultipleEndpoints() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james, admin, a, b, c);
template.sendBodyAndHeader("direct:a", "Hello World", "Subject",
"Hello a");
template.sendBodyAndHeader("direct:b", "Bye World", "Subject", "Hello
b");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
index cd76c06743b7..e3aa1316932a 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
@@ -45,7 +45,7 @@ public class MailContentTypeResolverTest extends
CamelTestSupport {
@Test
public void testCustomContentTypeResolver() throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
// create an exchange with a normal body and attachment to be produced
as email
Endpoint endpoint =
context.getEndpoint(james.uriPrefix(Protocol.smtp));
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
index ed19d0e8b726..bdba44648987 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
@@ -40,7 +40,7 @@ public class MailContentTypeTest extends CamelTestSupport {
@Test
public void testSendHtmlMail() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
TestSupport.sendBody(template, "direct:a",
"<html><body><h1>Hello</h1>World</body></html>");
@@ -53,7 +53,7 @@ public class MailContentTypeTest extends CamelTestSupport {
@Test
public void testSendPlainMail() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
TestSupport.sendBody(template, "direct:b", "Hello World");
@@ -65,7 +65,7 @@ public class MailContentTypeTest extends CamelTestSupport {
@Test
public void testSendMultipartMail() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
Map<String, Object> headers = new HashMap<>();
headers.put(MailConstants.MAIL_ALTERNATIVE_BODY, "Hello World");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
index 515019950c98..c72937d21074 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
@@ -40,8 +40,8 @@ public class MailConvertersTest extends CamelTestSupport {
@Override
public void setupResources() {
- Mailbox.clearAll();
james = Mailbox.getOrCreateUser("MailConvertersTest-james", "secret");
+ james.clear();
}
@Test
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
index b18317160dca..71dcd19a8ebc 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
@@ -59,7 +59,8 @@ public class MailCopyToTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
+ jones.clear("backup");
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
index 057cb1866357..d69d30a19f2f 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
@@ -37,7 +37,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
@Test
public void testSendHtmlMail() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
TestSupport.sendBody(template, "direct:a",
"<html><body><h1>Hello</h1>World</body></html>");
@@ -51,7 +51,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
@Test
public void testSendHtmlMailIso88591() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
TestSupport.sendBody(template, "direct:c",
"<html><body><h1>Hello</h1>World</body></html>");
@@ -65,7 +65,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
@Test
public void testNullBody() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
template.sendBodyAndHeader("direct:b", null,
MailConstants.MAIL_CONTENT_TYPE, "text/plain; charset=iso-8859-1");
@@ -77,7 +77,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
@Test
public void testSendPlainMailContentTypeInHeader() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
template.sendBodyAndHeader("direct:b", "Hello World",
MailConstants.MAIL_CONTENT_TYPE,
"text/plain; charset=iso-8859-1");
@@ -90,7 +90,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
@Test
public void testSendPlainMailContentTypeInHeader2() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
template.sendBodyAndHeader("direct:b", "Hello World",
Exchange.CONTENT_TYPE, "text/plain; charset=iso-8859-1");
@@ -102,7 +102,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
@Test
public void testSendPlainMailContentTypeTinyTypeInHeader() throws
Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
// Camel will fixup the Content-Type if you do not have a space after
the semi colon
template.sendBodyAndHeader("direct:b", "Hello World",
MailConstants.MAIL_CONTENT_TYPE, "text/plain;charset=iso-8859-1");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
index 7d7f8867c792..b3d7b8b21c9e 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
@@ -35,7 +35,7 @@ public class MailDefaultDelayForMailConsumeTest extends
CamelTestSupport {
@Test
public void testConsuming() throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bond);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello London");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
index 9fedddf89d87..b213108e6cf2 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
@@ -44,7 +44,7 @@ public class MailDisconnectTest extends CamelTestSupport {
@BeforeEach
void setup() {
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(expectedCount);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
index aae959856205..d34fe0947ad5 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
@@ -59,7 +59,7 @@ public class MailDoNotDeleteIfProcessFailsTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
index d78fa5e8c821..647a727d38f8 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
@@ -78,7 +78,7 @@ public class MailFetchSizeTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
index c07bb95e93c8..985f368d42af 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
@@ -58,7 +58,7 @@ public class MailFetchSizeZeroTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrideOptionsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrideOptionsTest.java
index 05e74785cf3f..fa94c6821723 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrideOptionsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrideOptionsTest.java
@@ -41,7 +41,7 @@ public class MailHeaderOverrideOptionsTest extends
CamelTestSupport {
@BeforeEach
public void setup() {
- Mailbox.clearAll();
+ Mailbox.clearAll(sender, epRcpt, hdrRcpt);
}
@Test
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
index 879931a858bf..98a8620e2145 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
@@ -38,7 +38,7 @@ public class MailHeaderOverrulePreConfigurationRecipientsTest
extends CamelTestS
@Test
public void testSendWithRecipientsInHeaders() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus, willem);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
index e1272a62fc22..3f571d018f37 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
@@ -46,7 +46,7 @@ public class MailHtmlAttachmentTest extends CamelTestSupport {
@Test
public void testSendAndReceiveMailWithAttachments() throws Exception {
// clear mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
// START SNIPPET: e1
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
index dab97c71b2ad..39062edbd0dd 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
@@ -72,7 +72,7 @@ public class MailIdempotentRepositoryDuplicateTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
index d69fb5b76275..f0309976331d 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
@@ -71,7 +71,7 @@ public class MailIdempotentRepositoryTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
index dbc7e0befa37..c7c0c2edc077 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
@@ -63,7 +63,7 @@ public class MailMaxMessagesPerPollTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
index fee3aeea9d00..5b95e0d3b87b 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
@@ -84,7 +84,6 @@ public class MailMessageTest extends CamelTestSupport {
@Override
public void doPostSetup() throws Exception {
- Mailbox.clearAll();
endpoint = checkEndpoint("pop3://someone@myhost:30/subject");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index b8c7a9547252..d1b170e7623f 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -48,7 +48,7 @@ public class MailMimeDecodeHeadersTest extends
CamelTestSupport {
@Test
public void testLongMailSubject() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(plain, decoded);
// The email subject is >76 chars and will get MIME folded.
template.sendBody("direct:longSubject", "");
@@ -70,7 +70,7 @@ public class MailMimeDecodeHeadersTest extends
CamelTestSupport {
@Test
public void testNonAsciiMailSubject() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(plain, decoded);
// The email subject contains non-ascii characters and will be encoded.
template.sendBody("direct:nonAsciiSubject", "");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
index 0e2e46399f09..d9b09c0fcbd0 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
@@ -89,7 +89,9 @@ public class MailMoveToTest extends CamelTestSupport {
}
private void prepareMailbox() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(jones, jones2);
+ jones.clear("moveToFolder");
+ jones2.clear("moveToFolder");
MailboxUser[] mailUser = new MailboxUser[] { jones, jones2 };
for (MailboxUser user : mailUser) {
JavaMailSender sender = new DefaultJavaMailSender();
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
index fba4a96b2667..38fc4453d7d2 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
@@ -37,7 +37,7 @@ public class MailMultipleRecipientsTest extends
CamelTestSupport {
@Test
public void testSendWithMultipleRecipientsInHeader() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus, willem, hadrian, tracy);
// START SNIPPET: e1
Map<String, Object> headers = new HashMap<>();
@@ -59,7 +59,7 @@ public class MailMultipleRecipientsTest extends
CamelTestSupport {
@Test
public void testSendWithMultipleRecipientsPreConfigured() throws Exception
{
- Mailbox.clearAll();
+ Mailbox.clearAll(claus, willem, hadrian, tracy);
assertMailbox("claus");
assertMailbox("willem");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
index 5c8e4e2c293f..8093ed44b7dc 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
@@ -38,7 +38,7 @@ public class MailMultipleRecipientsUsingHeadersTest extends
CamelTestSupport {
@Test
public void testMailMultipleRecipientUsingHeaders() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(claus, jon);
// START SNIPPET: e1
Map<String, Object> map = new HashMap<>();
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
index 6b3ad16bd4fa..549bf9de8945 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
@@ -32,7 +32,7 @@ public class MailNameAndEmailInRecipientTest extends
CamelTestSupport {
@Test
public void testSendWithNameAndEmailInRecipient() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(davsclaus, jstrachan);
// START SNIPPET: e1
Map<String, Object> headers = new HashMap<>();
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
index a535fa5b9c7a..ec8814620761 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
@@ -59,7 +59,7 @@ public class MailPollEnrichNoMailTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
index ebdd42d419c9..4815798d46b6 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
@@ -69,7 +69,7 @@ public class MailPollEnrichTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
index fdd6aa3fb51b..17b67f982279 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
@@ -70,7 +70,7 @@ public class MailPostProcessActionTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
index 88e66439c6f4..d41ee207d196 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
@@ -62,7 +62,7 @@ public class MailProcessOnlyUnseenMessagesTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(claus);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
claus.getLogin(), claus.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
index 5eedfa795274..3fb68d5b2ae9 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
@@ -54,7 +54,7 @@ public class MailProducerConcurrentTest extends
CamelTestSupport {
}
private void doSendMessages(int files, int poolSize) throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(camel, someone);
NotifyBuilder builder = new
NotifyBuilder(context).whenDone(files).create();
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
index 4ecf33234a03..e3fd9ea9ca7c 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
@@ -40,7 +40,7 @@ public class MailProducerTest extends CamelTestSupport {
@Test
public void testProducer() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(camel, someone, recipient2);
getMockEndpoint("mock:result").expectedMessageCount(1);
template.sendBodyAndHeader("direct:start", "Message ", "To",
someone.getEmail());
@@ -55,7 +55,7 @@ public class MailProducerTest extends CamelTestSupport {
@Test
public void testProducerBodyIsMimeMessage() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(camel, someone, recipient2);
getMockEndpoint("mock:result").expectedMessageCount(1);
Address from = new InternetAddress("fromCamelTest@localhost");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
index 9de71f732e50..57978b967c30 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
@@ -34,7 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
@Isolated
public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
- private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailProducerUnsupportedCharsetTest-jones", "secret");
+ private static final MailboxUser jones1 =
Mailbox.getOrCreateUser("MailProducerUnsupportedCharsetTest-jones1", "secret");
+ private static final MailboxUser jones2 =
Mailbox.getOrCreateUser("MailProducerUnsupportedCharsetTest-jones2", "secret");
@Override
public void setupResources() throws Exception {
@@ -42,13 +43,13 @@ public class MailProducerUnsupportedCharsetTest extends
CamelTestSupport {
}
@Test
- public void testSencUnsupportedCharset() throws Exception {
- Mailbox.clearAll();
+ public void testSendUnsupportedCharset() throws Exception {
+ jones1.clear();
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from(jones.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100&ignoreUnsupportedCharset=true")
+ from(jones1.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100&ignoreUnsupportedCharset=true")
.to("mock:result");
}
});
@@ -59,26 +60,26 @@ public class MailProducerUnsupportedCharsetTest extends
CamelTestSupport {
mock.allMessages().header("Content-Type").isEqualTo("text/plain");
Map<String, Object> headers = new HashMap<>();
- headers.put("To", jones.getEmail());
+ headers.put("To", jones1.getEmail());
headers.put("Content-Type", "text/plain");
- template.sendBodyAndHeaders(jones.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=true", "Hello World", headers);
+ template.sendBodyAndHeaders(jones1.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=true", "Hello World", headers);
headers.clear();
- headers.put("To", jones.getEmail());
- headers.put("Content-Type", "text/plain; charset=ansi_x3.110-1983");
- template.sendBodyAndHeaders(jones.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=true", "Bye World", headers);
+ headers.put("To", jones1.getEmail());
+ headers.put("Content-Type", "text/plain; charset=XXX");
+ template.sendBodyAndHeaders(jones1.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=true", "Bye World", headers);
- mock.assertIsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
- public void testSencUnsupportedCharsetDisabledOption() throws Exception {
- Mailbox.clearAll();
+ public void testSendUnsupportedCharsetDisabledOption() throws Exception {
+ jones2.clear();
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from(jones.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100&ignoreUnsupportedCharset=false")
+ from(jones2.uriPrefix(Protocol.pop3) +
"&initialDelay=100&delay=100&ignoreUnsupportedCharset=false")
.to("mock:result");
}
});
@@ -89,22 +90,23 @@ public class MailProducerUnsupportedCharsetTest extends
CamelTestSupport {
mock.allMessages().header("Content-Type").isEqualTo("text/plain");
Map<String, Object> headers = new HashMap<>();
- headers.put("To", jones.getEmail());
+ headers.put("To", jones2.getEmail());
headers.put("Content-Type", "text/plain");
- template.sendBodyAndHeaders(jones.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=false", "Hello World", headers);
+ template.sendBodyAndHeaders(jones2.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=false", "Hello World",
+ headers);
headers.clear();
- headers.put("To", jones.getEmail());
+ headers.put("To", jones2.getEmail());
headers.put("Content-Type", "text/plain; charset=XXX");
RuntimeCamelException e = assertThrows(RuntimeCamelException.class,
- () ->
template.sendBodyAndHeaders(jones.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=false",
+ () ->
template.sendBodyAndHeaders(jones2.uriPrefix(Protocol.smtp) +
"&ignoreUnsupportedCharset=false",
"Bye World",
headers),
"Should have thrown an exception");
assertIsInstanceOf(UnsupportedEncodingException.class, e.getCause());
- mock.assertIsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
index 8956bbbe8adf..d062431af945 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
@@ -37,7 +37,7 @@ public class MailRecipientsPipeIssueTest extends
CamelTestSupport {
@Test
public void testMultiRecipients() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(you, camelPipes, easyPipes);
TestSupport.sendBody(template, "direct:a", "Camel does really rock");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
index 7f2c8d55844a..b293b3f08775 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
@@ -48,7 +48,7 @@ public class MailRecipientsTest extends CamelTestSupport {
@Test
public void testMultiRecipients() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(you, camelRiders, easyRiders, me, someone, to);
TestSupport.sendBody(template, "direct:a", "Camel does really rock");
@@ -92,7 +92,7 @@ public class MailRecipientsTest extends CamelTestSupport {
@Test
public void testHeadersBlocked() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(you, camelRiders, easyRiders, me, someone, to);
// direct:b blocks all message headers
Map<String, Object> headers = new HashMap<>();
@@ -110,7 +110,7 @@ public class MailRecipientsTest extends CamelTestSupport {
@Test
public void testSpecificHeaderBlocked() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(you, camelRiders, easyRiders, me, someone, to);
// direct:c blocks the "cc" message header - so only "to" will be used
here
Map<String, Object> headers = new HashMap<>();
@@ -127,7 +127,7 @@ public class MailRecipientsTest extends CamelTestSupport {
@Test
public void testSpecificHeaderBlockedInjection() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(you, camelRiders, easyRiders, me, someone, to);
// direct:c blocks the "cc" message header - but we are trying to
inject cc in via another header
Map<String, Object> headers = new HashMap<>();
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
index c299c01c1395..8b2dd42abc06 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
@@ -35,7 +35,7 @@ public class MailReplyToTest extends CamelTestSupport {
@Test
public void testMailReplyTo() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(christian);
String body = "The Camel riders";
@@ -57,7 +57,7 @@ public class MailReplyToTest extends CamelTestSupport {
@Test
public void testMailReplyTo2() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(christian);
String body = "The Camel riders";
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index c5a361141dcf..7bb863c52d0c 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -47,7 +47,7 @@ public class MailRouteTest extends CamelTestSupport {
@Test
public void testSendAndReceiveMails() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james, result, copy);
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived("hello world!");
@@ -72,7 +72,7 @@ public class MailRouteTest extends CamelTestSupport {
@Test
public void testMailSubjectWithUnicode() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james, result, copy);
final String body = "Hello Camel Riders!";
final String subject = "My Camel \u2122";
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
index 6dc445def8a5..97870859a367 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
@@ -66,7 +66,7 @@ public class MailSearchTermTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
index 3f8e4514fe0d..41b4f3ecb79f 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
@@ -56,7 +56,7 @@ public class MailSearchTermUriConfigLast24HoursTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
index c82f67d40f74..b33353da4457 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
@@ -52,7 +52,7 @@ public class MailSearchTermUriConfigTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
index d2b9f73de5d9..d667b050c176 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
@@ -75,7 +75,7 @@ public class MailShutdownCompleteAllTasksTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
index eebafe77f2bc..9e1373f525fa 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
@@ -62,7 +62,7 @@ public class MailShutdownCompleteCurrentTaskOnlyTest extends
CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(jones);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
jones.getLogin(), jones.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
index fa3ed60329ad..29ea2317fb4e 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
@@ -72,7 +72,7 @@ public class MailSortTermTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
index a1bf074e443c..176253f6f443 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
@@ -72,7 +72,7 @@ public class MailSortTermThreeTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
index 9cdfddcd88d5..9a5386aa4d23 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
@@ -72,7 +72,7 @@ public class MailSortTermTwoTest extends CamelTestSupport {
private void prepareMailbox() throws Exception {
// connect to mailbox
- Mailbox.clearAll();
+ Mailbox.clearAll(bill);
JavaMailSender sender = new DefaultJavaMailSender();
Store store = sender.getSession().getStore("imap");
store.connect("localhost", Mailbox.getPort(Protocol.imap),
bill.getLogin(), bill.getPassword());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
index 9755fb3ee2a2..ebd4f510d9b3 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
@@ -51,7 +51,7 @@ public class MailSplitAttachmentsTest extends
CamelTestSupport {
@BeforeEach
public void clearMailBox() {
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
}
@BeforeEach
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
index 9f987fec34da..51d57cbf2689 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
@@ -35,7 +35,7 @@ public class MailSubjectTest extends CamelTestSupport {
@Test
public void testMailSubject() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james2);
String body = "Hello Claus.\r\nYes it does.\r\n\r\nRegards James.";
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
index ce1d8a2391f6..9331509f8acd 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
@@ -37,7 +37,7 @@ public class MailToMultipleEndpointsTest extends
CamelTestSupport {
@Test
public void testMultipleEndpoints() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james2, james, admin, a, b, c);
template.sendBodyAndHeader("direct:a", "Hello World", "Subject",
"Hello a");
template.sendBodyAndHeader("direct:b", "Bye World", "Subject", "Hello
b");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
index 7762d186cc44..e44bb78ef0f9 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
@@ -32,7 +32,7 @@ public class MailUsernameWithAtSignTest extends
CamelTestSupport {
@Test
public void testMailUsingAtSignInUsername() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(jamesAtSign);
String body = "Hello Claus.\r\nYes it does.\r\n\r\nRegards James.\r\n";
template.sendBody("direct:a", body);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
index 8a61d95673ed..6f4a3d48211c 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -43,7 +43,7 @@ public class MailUsingCustomSessionTest extends
CamelTestSupport {
@Override
public void doPostSetup() {
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
}
@Test
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
index 3a661cd02cf8..b7b4a9c46ce0 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
@@ -38,7 +38,7 @@ public class MailUsingHeadersTest extends CamelTestSupport {
@Test
public void testMailUsingHeaders() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(davsclaus);
// START SNIPPET: e1
Map<String, Object> map = new HashMap<>();
@@ -66,7 +66,7 @@ public class MailUsingHeadersTest extends CamelTestSupport {
@Test
public void testMailWithFromInEndpoint() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(davsclaus);
Map<String, Object> map = new HashMap<>();
map.put("Subject", "Camel rocks");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
index 20d7796df249..657134736055 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
@@ -55,7 +55,7 @@ public class MailUsingOwnComponentTest extends
CamelTestSupport {
@Test
public void testUsingOwnMailComponent() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james, davsclaus);
template.sendBodyAndHeader("mailbox:localhost?useHeaderRecipients=true", "Hello
Mailbox", "to", davsclaus.getEmail());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/Mailbox.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/Mailbox.java
index 560bb615fe90..83dfc7f56cee 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/Mailbox.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/Mailbox.java
@@ -77,6 +77,19 @@ public final class Mailbox {
}
}
+ /**
+ * Purge all mail folders for the given users.
+ */
+ public static void clearAll(MailboxUser... users) {
+ if (users != null) {
+ for (MailboxUser user : users) {
+ if (user != null) {
+ user.clear();
+ }
+ }
+ }
+ }
+
/**
* @param protocol the protocol whose should be returned
* @return the port of the given {@code protocol} the static test
server instance is listening on
@@ -216,6 +229,20 @@ public final class Mailbox {
return user.getPassword();
}
+ public void clear() {
+ clear("INBOX");
+ }
+
+ public void clear(String folderName) {
+ final GreenMailUser greenMailUser =
greenMail.getUserManager().getUserByEmail(user.getEmail());
+ if (greenMailUser != null) {
+ final MailFolder folder =
greenMail.getManagers().getImapHostManager().getFolder(greenMailUser,
folderName);
+ if (folder != null) {
+ folder.deleteAllMessages();
+ }
+ }
+ }
+
public Mailbox getInbox() {
return getFolder("INBOX");
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
index 2ce73701bc99..2ffda99611b4 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
@@ -53,7 +53,7 @@ public class MimeMessageConsumeTest extends CamelTestSupport {
@Test
public void testSendAndReceiveMails() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james3, james4);
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
index 931195cc10ed..9ac339c0e49b 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
@@ -46,7 +46,7 @@ public class MimeMultipartAlternativeTest extends
CamelTestSupport {
private String htmlBody = "<html><body><h1>Hello</h1>World<img
src=\"cid:0001\"></body></html>";
private void sendMultipartEmail(boolean useInlineattachments) {
- Mailbox.clearAll();
+ Mailbox.clearAll(ryan);
// create an exchange with a normal body and attachment to be produced
as email
MailEndpoint endpoint =
context.getEndpoint(ryan.uriPrefix(Protocol.smtp), MailEndpoint.class);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
index 52f9ced478d3..75c1e848c6d6 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
@@ -43,7 +43,7 @@ public class MimeMultipartAlternativeWithContentTypeTest
extends CamelTestSuppor
private String htmlBody = "<html><body><h1>Hello</h1>World</body></html>";
private void sendMultipartEmail() {
- Mailbox.clearAll();
+ Mailbox.clearAll(sachin);
// create an exchange with a normal body and attachment to be produced
as email
MailEndpoint endpoint = context.getEndpoint(
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
index 2b22d37af982..5c1b191b2b4b 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
@@ -47,7 +47,7 @@ public class MimeMultipartAlternativeWithLongerFilenameTest
extends CamelTestSup
private String htmlBody = "<html><body><h1>Hello</h1>World<img
src=\"cid:myCoolLogo.jpeg\"></body></html>";
private void sendMultipartEmail(boolean useInlineattachments) {
- Mailbox.clearAll();
+ Mailbox.clearAll(ryanWithLongerFilename);
// create an exchange with a normal body and attachment to be produced
as email
MailEndpoint endpoint =
context.getEndpoint(ryanWithLongerFilename.uriPrefix(Protocol.smtp),
MailEndpoint.class);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
index 3742d5e10ff2..4f79847ebc4e 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
@@ -51,7 +51,7 @@ public class MultipleDestinationConsumeTest extends
CamelTestSupport {
@Test
public void testSendAndReceiveMails() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james, bar);
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
index 4d24eacc6382..ff32a39564c2 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
@@ -49,7 +49,7 @@ public class NestedMimeMessageConsumeTest extends
CamelTestSupport {
@Test
public void testNestedMultipart() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(james3, james4);
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index 4bcbc6192f84..ce2628e4a0d1 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -64,7 +64,7 @@ public class RawMailMessageTest extends CamelTestSupport {
@Override
protected void cleanupResources() throws Exception {
- Mailbox.clearAll();
+ Mailbox.clearAll(jonesPop3, jonesRawPop3, jonesImap, jonesRawImap,
davsclaus);
}
@Test
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
index a0dcbab71daf..eb4bf8f5bdb8 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
@@ -44,7 +44,6 @@ public class SearchTermBuilderTest {
assertNotNull(st);
// create dummy message
- Mailbox.clearAll();
JavaMailSender sender = new DefaultJavaMailSender();
MimeMessage msg = new MimeMessage(sender.getSession());
@@ -68,7 +67,6 @@ public class SearchTermBuilderTest {
assertNotNull(st);
// create dummy message
- Mailbox.clearAll();
JavaMailSender sender = new DefaultJavaMailSender();
MimeMessage msg = new MimeMessage(sender.getSession());
@@ -93,7 +91,6 @@ public class SearchTermBuilderTest {
assertNotNull(st);
// create dummy message
- Mailbox.clearAll();
JavaMailSender sender = new DefaultJavaMailSender();
MimeMessage msg = new MimeMessage(sender.getSession());
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
index 44a44dff0973..dc567655303b 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
@@ -56,7 +56,7 @@ public class SpringMailSplitAttachmentsTest extends
CamelSpringTestSupport {
@BeforeEach
public void clearMailBox() {
- Mailbox.clearAll();
+ Mailbox.clearAll(james);
}
@BeforeEach
