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 05b6e7030390 Replace deprecated method in mail component test
05b6e7030390 is described below
commit 05b6e70303907cfe71d0f33d67e2a3f1e5d87178
Author: Aurélien Pupier <[email protected]>
AuthorDate: Fri Jul 10 12:16:19 2026 +0200
Replace deprecated method in mail component test
it remains only doPostSetup() methods
Signed-off-by: Aurélien Pupier <[email protected]>
---
.../org/apache/camel/component/mail/MailAttachmentNamesTest.java | 2 +-
.../org/apache/camel/component/mail/MailBatchConsumerTest.java | 2 +-
.../apache/camel/component/mail/MailCommitOnCompletionTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailComponentTest.java | 3 ++-
.../java/org/apache/camel/component/mail/MailContentTypeTest.java | 7 ++++---
.../java/org/apache/camel/component/mail/MailConvertersTest.java | 2 +-
.../test/java/org/apache/camel/component/mail/MailCopyToTest.java | 2 +-
.../apache/camel/component/mail/MailCustomContentTypeTest.java | 5 +++--
.../org/apache/camel/component/mail/MailCustomMailSenderTest.java | 3 ++-
.../camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailFetchSizeTest.java | 2 +-
.../org/apache/camel/component/mail/MailFetchSizeZeroTest.java | 2 +-
.../component/mail/MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../apache/camel/component/mail/MailIdempotentRepositoryTest.java | 2 +-
.../apache/camel/component/mail/MailMaxMessagesPerPollTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailMessageTest.java | 3 ++-
.../test/java/org/apache/camel/component/mail/MailMoveToTest.java | 2 +-
.../org/apache/camel/component/mail/MailPollEnrichNoMailTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailPollEnrichTest.java | 2 +-
.../apache/camel/component/mail/MailPostProcessActionTest.java | 2 +-
.../camel/component/mail/MailProcessOnlyUnseenMessagesTest.java | 7 ++++---
.../camel/component/mail/MailProducerUnsupportedCharsetTest.java | 4 ++--
.../apache/camel/component/mail/MailRecipientsPipeIssueTest.java | 3 ++-
.../java/org/apache/camel/component/mail/MailRecipientsTest.java | 3 ++-
.../java/org/apache/camel/component/mail/MailSearchTermTest.java | 2 +-
.../component/mail/MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../apache/camel/component/mail/MailSearchTermUriConfigTest.java | 2 +-
.../camel/component/mail/MailShutdownCompleteAllTasksTest.java | 8 ++------
.../component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailSortTermTest.java | 2 +-
.../org/apache/camel/component/mail/MailSortTermThreeTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../camel/component/mail/MultipleDestinationConsumeTest.java | 2 +-
.../mail/security/SslContextParametersMailRouteTest.java | 7 ++-----
34 files changed, 50 insertions(+), 49 deletions(-)
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 3014dec9c2b2..10a70aa41279 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
@@ -57,7 +57,7 @@ public class MailAttachmentNamesTest extends CamelTestSupport
{
Session session;
@Override
- public void doPreSetup() {
+ public void setupResources() {
session = Mailbox.getSmtpSession();
}
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 593dc5258606..e4f26ddc3304 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
@@ -39,7 +39,7 @@ public class MailBatchConsumerTest extends CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailBatchConsumerTest-jones", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 01aaf29f7645..6ac0d979cec2 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
@@ -40,7 +40,7 @@ public class MailCommitOnCompletionTest extends
CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("jonesCommitOnCompletion", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
index be56dfc0ef21..fab7dd5c6e01 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
@@ -20,6 +20,7 @@ import jakarta.mail.Message;
import org.apache.camel.Endpoint;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf;
@@ -291,7 +292,7 @@ public class MailComponentTest extends CamelTestSupport {
}
protected MailEndpoint checkEndpoint(String uri) {
- Endpoint endpoint = super.resolveMandatoryEndpoint(uri);
+ Endpoint endpoint = TestSupport.resolveMandatoryEndpoint(context, uri);
return assertIsInstanceOf(MailEndpoint.class, endpoint);
}
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 5e064fa8d46e..ed19d0e8b726 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
@@ -26,6 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -41,7 +42,7 @@ public class MailContentTypeTest extends CamelTestSupport {
public void testSendHtmlMail() throws Exception {
Mailbox.clearAll();
- sendBody("direct:a", "<html><body><h1>Hello</h1>World</body></html>");
+ TestSupport.sendBody(template, "direct:a",
"<html><body><h1>Hello</h1>World</body></html>");
Mailbox box = claus.getInbox();
Message msg = box.get(0);
@@ -54,7 +55,7 @@ public class MailContentTypeTest extends CamelTestSupport {
public void testSendPlainMail() throws Exception {
Mailbox.clearAll();
- sendBody("direct:b", "Hello World");
+ TestSupport.sendBody(template, "direct:b", "Hello World");
Mailbox box = claus.getInbox();
Message msg = box.get(0);
@@ -68,7 +69,7 @@ public class MailContentTypeTest extends CamelTestSupport {
Map<String, Object> headers = new HashMap<>();
headers.put(MailConstants.MAIL_ALTERNATIVE_BODY, "Hello World");
- sendBody("direct:c", "<html><body><h1>Hello</h1>World</body></html>",
headers);
+ TestSupport.sendBody(template, "direct:c",
"<html><body><h1>Hello</h1>World</body></html>", headers);
Mailbox box = claus.getInbox();
Message msg = box.get(0);
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 4064137d8158..515019950c98 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
@@ -39,7 +39,7 @@ public class MailConvertersTest extends CamelTestSupport {
private MailboxUser james;
@Override
- public void doPreSetup() {
+ public void setupResources() {
Mailbox.clearAll();
james = Mailbox.getOrCreateUser("MailConvertersTest-james", "secret");
}
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 1a80db4477bf..b18317160dca 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
@@ -40,7 +40,7 @@ public class MailCopyToTest extends CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailCopyToTest-jones", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 9881dd11794a..057cb1866357 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
@@ -23,6 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,7 +39,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
public void testSendHtmlMail() throws Exception {
Mailbox.clearAll();
- sendBody("direct:a", "<html><body><h1>Hello</h1>World</body></html>");
+ TestSupport.sendBody(template, "direct:a",
"<html><body><h1>Hello</h1>World</body></html>");
Mailbox box = claus.getInbox();
Message msg = box.get(0);
@@ -52,7 +53,7 @@ public class MailCustomContentTypeTest extends
CamelTestSupport {
public void testSendHtmlMailIso88591() throws Exception {
Mailbox.clearAll();
- sendBody("direct:c", "<html><body><h1>Hello</h1>World</body></html>");
+ TestSupport.sendBody(template, "direct:c",
"<html><body><h1>Hello</h1>World</body></html>");
Mailbox box = claus.getInbox();
Message msg = box.get(0);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
index 64b5763a83b5..b68375ba33d9 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -40,7 +41,7 @@ public class MailCustomMailSenderTest extends
CamelTestSupport {
@Test
public void testSendWithCustomMailSender() {
- sendBody(claus.uriPrefix(Protocol.smtp) + "&javaMailSender=#mySender",
"Hello World");
+ TestSupport.sendBody(template, claus.uriPrefix(Protocol.smtp) +
"&javaMailSender=#mySender", "Hello World");
assertTrue(sent, "Should have used custom mail sender");
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 562c092401d0..aae959856205 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
@@ -42,7 +42,7 @@ public class MailDoNotDeleteIfProcessFailsTest extends
CamelTestSupport {
private static int counter;
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 65bdb4b5cc4e..d78fa5e8c821 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
@@ -40,7 +40,7 @@ public class MailFetchSizeTest extends CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailFetchSizeTest-jones", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 741d32d12fbf..c07bb95e93c8 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
@@ -37,7 +37,7 @@ public class MailFetchSizeZeroTest extends CamelTestSupport {
private static final MailboxUser bill =
Mailbox.getOrCreateUser("MailFetchSizeZeroTest-bill", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 e994baad5006..dab97c71b2ad 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
@@ -45,7 +45,7 @@ public class MailIdempotentRepositoryDuplicateTest extends
CamelTestSupport {
MemoryIdempotentRepository myRepo = new MemoryIdempotentRepository();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
myRepo.start();
prepareMailbox();
}
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 e3a7743e9d1b..d69fb5b76275 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
@@ -45,7 +45,7 @@ public class MailIdempotentRepositoryTest extends
CamelTestSupport {
private MemoryIdempotentRepository myRepo = new
MemoryIdempotentRepository();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
myRepo.start();
prepareMailbox();
}
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 a93061a0fc31..dbc7e0befa37 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
@@ -36,7 +36,7 @@ public class MailMaxMessagesPerPollTest extends
CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailMaxMessagesPerPollTest-jones", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 ca638577df88..fee3aeea9d00 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
@@ -29,6 +29,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.apache.camel.util.CastUtils;
import org.junit.jupiter.api.Test;
@@ -96,7 +97,7 @@ public class MailMessageTest extends CamelTestSupport {
}
protected MailEndpoint checkEndpoint(String uri) {
- Endpoint endpoint = super.resolveMandatoryEndpoint(uri);
+ Endpoint endpoint = TestSupport.resolveMandatoryEndpoint(context, uri);
return assertIsInstanceOf(MailEndpoint.class, endpoint);
}
}
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 2921b69586e0..0e2e46399f09 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
@@ -45,7 +45,7 @@ public class MailMoveToTest extends CamelTestSupport {
private static final MailboxUser jones2 =
Mailbox.getOrCreateUser("MailMoveToTest-jones2", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 a991c1059692..a535fa5b9c7a 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
@@ -33,7 +33,7 @@ public class MailPollEnrichNoMailTest extends
CamelTestSupport {
private static final MailboxUser bill =
Mailbox.getOrCreateUser("MailPollEnrichNoMailTest-bill", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 8d6d3f3f61fa..ebdd42d419c9 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
@@ -37,7 +37,7 @@ public class MailPollEnrichTest extends CamelTestSupport {
private static final MailboxUser bill =
Mailbox.getOrCreateUser("MailPollEnrichTest-bill", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 6e41a23315ac..fdd6aa3fb51b 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
@@ -47,7 +47,7 @@ public class MailPostProcessActionTest extends
CamelTestSupport {
private TestPostProcessAction action = new TestPostProcessAction();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 5b1beef2d8ef..88e66439c6f4 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
@@ -27,6 +27,7 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
/**
@@ -36,13 +37,13 @@ public class MailProcessOnlyUnseenMessagesTest extends
CamelTestSupport {
private static final MailboxUser claus =
Mailbox.getOrCreateUser("MailProcessOnlyUnseenMessagesTest-claus", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
@Test
public void testProcessOnlyUnseenMessages() throws Exception {
- sendBody("direct:a", "Message 3");
+ TestSupport.sendBody(template, "direct:a", "Message 3");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -53,7 +54,7 @@ public class MailProcessOnlyUnseenMessagesTest extends
CamelTestSupport {
mock.reset();
// send a new message, now we should only receive this new massages as
all the others has been SEEN
- sendBody("direct:a", "Message 4");
+ TestSupport.sendBody(template, "direct:a", "Message 4");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Message 4");
mock.assertIsSatisfied();
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 eb0bd8b8482d..9de71f732e50 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
@@ -37,8 +37,8 @@ public class MailProducerUnsupportedCharsetTest extends
CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailProducerUnsupportedCharsetTest-jones", "secret");
@Override
- public boolean isUseRouteBuilder() {
- return false;
+ public void setupResources() throws Exception {
+ testConfiguration().withUseRouteBuilder(false);
}
@Test
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 7b027ae27b65..8956bbbe8adf 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
@@ -22,6 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,7 +39,7 @@ public class MailRecipientsPipeIssueTest extends
CamelTestSupport {
public void testMultiRecipients() throws Exception {
Mailbox.clearAll();
- sendBody("direct:a", "Camel does really rock");
+ TestSupport.sendBody(template, "direct:a", "Camel does really rock");
Mailbox inbox = camelPipes.getInbox();
Message msg = inbox.get(0);
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 05d9f7105254..7f2c8d55844a 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
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -49,7 +50,7 @@ public class MailRecipientsTest extends CamelTestSupport {
public void testMultiRecipients() throws Exception {
Mailbox.clearAll();
- sendBody("direct:a", "Camel does really rock");
+ TestSupport.sendBody(template, "direct:a", "Camel does really rock");
Mailbox inbox = camelRiders.getInbox();
Message msg = inbox.get(0);
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 007408b03e30..6dc445def8a5 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
@@ -41,7 +41,7 @@ public class MailSearchTermTest extends CamelTestSupport {
private SearchTerm term = createSearchTerm();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 0159060301b9..3f8e4514fe0d 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
@@ -37,7 +37,7 @@ public class MailSearchTermUriConfigLast24HoursTest extends
CamelTestSupport {
private static final MailboxUser bill =
Mailbox.getOrCreateUser("MailSearchTermUriConfigLast24HoursTest-bill",
"secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 6adac023cda0..c82f67d40f74 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
@@ -35,7 +35,7 @@ public class MailSearchTermUriConfigTest extends
CamelTestSupport {
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill",
"secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 f48d8a538149..d2b9f73de5d9 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
@@ -39,13 +39,9 @@ public class MailShutdownCompleteAllTasksTest extends
CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailShutdownCompleteAllTasksTest-jones", "secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
- }
-
- @Override
- public boolean isUseRouteBuilder() {
- return false;
+ testConfiguration().withUseRouteBuilder(false);
}
@Test
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 c9e00f65af1e..eebafe77f2bc 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
@@ -38,7 +38,7 @@ public class MailShutdownCompleteCurrentTaskOnlyTest extends
CamelTestSupport {
private static final MailboxUser jones =
Mailbox.getOrCreateUser("MailShutdownCompleteCurrentTaskOnlyTest-jones",
"secret");
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 9ace5ad1069b..fa3ed60329ad 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
@@ -52,7 +52,7 @@ public class MailSortTermTest extends CamelTestSupport {
private SearchTerm searchTerm = new
SearchTermBuilder().subject("Camel").build();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 6b104fe5b0a5..a1bf074e443c 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
@@ -52,7 +52,7 @@ public class MailSortTermThreeTest extends CamelTestSupport {
private SearchTerm searchTerm = new
SearchTermBuilder().subject("Camel").build();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 79c1dd733882..9cdfddcd88d5 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
@@ -52,7 +52,7 @@ public class MailSortTermTwoTest extends CamelTestSupport {
private SearchTerm searchTerm = new
SearchTermBuilder().subject("Camel").build();
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
prepareMailbox();
}
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 3d3221177e08..3742d5e10ff2 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
@@ -104,7 +104,7 @@ public class MultipleDestinationConsumeTest extends
CamelTestSupport {
}
@Override
- public void doPreSetup() throws Exception {
+ public void setupResources() throws Exception {
mailSession = Mailbox.getSmtpSession();
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
index 37eeb967c0c9..cf95c0e3ed72 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
@@ -107,11 +107,8 @@ public class SslContextParametersMailRouteTest extends
CamelTestSupport {
.contains("unable to find valid certification path to
requested target"));
}
- /**
- * Stop Camel startup.
- */
@Override
- public boolean isUseAdviceWith() {
- return true;
+ protected void setupResources() throws Exception {
+ testConfiguration().withUseRouteBuilder(false);
}
}
