You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/10/04 12:19:59 UTC
[camel] 03/03: (chores) Inlined calls to CamelTestSupport.resetMocks
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ef9e711e5ab50a2a1c47eb83b69a1691000ffa2c
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Sat Oct 1 17:59:17 2022 +0200
(chores) Inlined calls to CamelTestSupport.resetMocks
---
.../camel/component/aws/xray/CamelAwsXRayTestSupport.java | 4 ++--
.../csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java | 2 +-
.../camel/component/disruptor/DisruptorBufferingTest.java | 2 +-
.../disruptor/DisruptorConsumerSuspendResumeTest.java | 4 ++--
.../component/disruptor/DisruptorMultipleConsumersTest.java | 4 ++--
.../remote/integration/FtpConsumerDoneFileNameFixedIT.java | 2 +-
.../file/remote/integration/FtpConsumerDoneFileNameIT.java | 2 +-
.../integration/FtpConsumerIdempotentKeyChangedIssueIT.java | 2 +-
.../remote/integration/FtpConsumerIdempotentMemoryRefIT.java | 2 +-
.../component/ignite/IgniteCacheContinuousQueryTest.java | 6 +++---
.../org/apache/camel/component/ignite/IgniteEventsTest.java | 2 +-
.../camel/component/jetty/HttpEmptyQueryParameterTest.java | 2 +-
.../component/jetty/JettyLongestContextPathMatchTest.java | 12 ++++++------
.../camel/component/jetty/rest/RestJettyGetCorsTest.java | 2 +-
.../camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java | 4 ++--
.../jms/JmsRequestReplyTempQueueMultipleConsumersTest.java | 2 +-
.../org/apache/camel/component/jms/JmsSuspendResumeTest.java | 4 ++--
.../apache/camel/component/jms/ManagedJmsSelectorTest.java | 2 +-
.../camel/component/jms/TwoConsumerOnSameQueueTest.java | 6 +++---
.../camel/component/jms/TwoConsumerOnSameTopicTest.java | 6 +++---
.../DynamicRoutersWithJMSMessageLostHeadersIssueTest.java | 2 +-
.../apache/camel/language/joor/JoorPreCompileFalseTest.java | 2 +-
.../test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java | 2 +-
.../metrics/messagehistory/ManagedMessageHistoryTest.java | 2 +-
.../camel/component/mllp/MllpIdleTimeoutStrategyTest.java | 2 +-
.../netty/http/NettyHttpEmptyQueryParameterTest.java | 2 +-
.../netty/http/NettyHttpTwoRoutesStopOneRouteTest.java | 2 +-
.../component/netty/http/rest/RestNettyHttpGetCorsTest.java | 2 +-
.../camel/component/pubnub/example/PubNubStateExample.java | 2 +-
.../pulsar/integration/PulsarConsumerPatternInIT.java | 2 +-
.../apache/camel/component/quartz/QuartzStopRouteTest.java | 4 ++--
.../camel/component/quartz/QuartzSuspendRouteTest.java | 4 ++--
.../quartz/FileConsumerQuartzSchedulerRestartTest.java | 2 +-
.../rabbitmq/integration/RabbitMQSupendResumeIT.java | 4 ++--
.../camel/component/sjms/SjmsComponentRestartTest.java | 4 ++--
.../camel/component/sjms2/Sjms2ComponentRestartTest.java | 4 ++--
.../camel/component/stax/IssueWithWrongEncodingTest.java | 2 +-
.../java/org/apache/camel/test/junit5/CamelTestSupport.java | 9 +--------
.../component/undertow/rest/RestUndertowHttpGetCorsTest.java | 4 ++--
.../undertow/rest/RestUndertowHttpGetOrderingIssueTest.java | 4 ++--
.../undertow/rest/RestUndertowHttpMultipleVerbsTest.java | 2 +-
.../undertow/rest/UndertowHttpEmptyQueryParameterTest.java | 2 +-
.../vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java | 4 ++--
.../camel/component/xslt/saxon/SAXSourceLogBodyTest.java | 2 +-
.../dataformat/zipfile/ZipFileIteratorDataFormatTest.java | 2 +-
.../dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java | 4 ++--
.../camel/itest/jetty/JettyFailoverRoundRobinTest.java | 2 +-
.../itest/jetty/JettySimulateFailoverRoundRobinTest.java | 2 +-
.../camel/itest/jetty/JettySpringFailoverRoundRobinTest.java | 2 +-
50 files changed, 75 insertions(+), 82 deletions(-)
diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
index 114138dcbf1..66e60d8d3b4 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
@@ -60,9 +61,8 @@ public class CamelAwsXRayTestSupport extends CamelTestSupport {
socketListener.getReceivedData().clear();
}
- @Override
protected void resetMocks() {
- super.resetMocks();
+ MockEndpoint.resetMocks(context);
}
@Override
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
index 6664d7cbdde..7ccc40169b4 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
@@ -40,7 +40,7 @@ public class CsvUnmarshalTwoCsvDataFormatConcurrentTest extends CamelTestSupport
result2.expectedMessageCount(1);
sendAndVerify("|", result);
- resetMocks();
+ MockEndpoint.resetMocks(context);
result.expectedMessageCount(1);
result2.expectedMessageCount(1);
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
index 9d30bed3c77..cd88b33e2fa 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
@@ -86,7 +86,7 @@ public class DisruptorBufferingTest extends CamelTestSupport {
mockEndpoint.expectedMessageCount(3);
mockEndpoint.assertIsSatisfied();
- resetMocks();
+ MockEndpoint.resetMocks(context);
template.sendBody("disruptor:foo", "D");
template.sendBody("disruptor:foo", "E");
template.sendBody("disruptor:foo", "F");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
index 398e1c04803..b24eff1bbd3 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
@@ -48,7 +48,7 @@ public class DisruptorConsumerSuspendResumeTest extends CamelTestSupport {
// send a message to the route but the consumer is suspended
// so it should not route it
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
// wait a bit to ensure consumer is suspended, as it could be in a poll mode where
@@ -60,7 +60,7 @@ public class DisruptorConsumerSuspendResumeTest extends CamelTestSupport {
mock.assertIsSatisfied(2000);
// resume consumer
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(1);
// resume bar consumer (not the route)
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
index ecf5eed02e1..af853f0cdfb 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
@@ -52,7 +52,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
}
});
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(20);
getMockEndpoint("mock:b").expectedMessageCount(20);
@@ -63,7 +63,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
template.sendBody("disruptor:bar", "Bye World");
}
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
context.getRouteController().suspendRoute("testRoute");
getMockEndpoint("mock:a").expectedMessageCount(20);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
index b182555c016..45398e1a602 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
@@ -43,7 +43,7 @@ public class FtpConsumerDoneFileNameFixedIT extends FtpServerTestSupport {
// done file
await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java
index c33e2444f84..f8c30a3d6d2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java
@@ -44,7 +44,7 @@ public class FtpConsumerDoneFileNameIT extends FtpServerTestSupport {
MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
index 011ea31b950..42301f53c39 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
@@ -45,7 +45,7 @@ public class FtpConsumerIdempotentKeyChangedIssueIT extends FtpServerTestSupport
oneExchangeDone.matches(5, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:file").expectedBodiesReceived("Hello World Again");
template.sendBodyAndHeader(endpoint, "Hello World Again", Exchange.FILE_NAME, "hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
index c0a790a4efe..661071244f4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
@@ -66,7 +66,7 @@ public class FtpConsumerIdempotentMemoryRefIT extends FtpServerTestSupport {
assertTrue(repo.contains("d.txt"));
assertTrue(repo.contains("e.txt"));
- resetMocks();
+ MockEndpoint.resetMocks(context);
notify = new NotifyBuilder(context).whenDone(2).create();
getMockEndpoint("mock:result").expectedMessageCount(2);
diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
index ee58748e199..6a996731de4 100644
--- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
+++ b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
@@ -114,7 +114,7 @@ public class IgniteCacheContinuousQueryTest extends AbstractIgniteTest implement
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:test2").expectedMessageCount(100);
@@ -136,7 +136,7 @@ public class IgniteCacheContinuousQueryTest extends AbstractIgniteTest implement
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:test3").expectedMessageCount(50);
@@ -219,7 +219,7 @@ public class IgniteCacheContinuousQueryTest extends AbstractIgniteTest implement
context.getRouteController().stopRoute(route.getId());
}
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
public static class Person implements Serializable {
diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
index 806262907a3..824034d2766 100644
--- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
+++ b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
@@ -135,7 +135,7 @@ public class IgniteEventsTest extends AbstractIgniteTest {
}
context.getRouteController().stopRoute(route.getId());
}
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
@Override
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java
index 5f48bfd8003..026626bc150 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java
@@ -31,7 +31,7 @@ public class HttpEmptyQueryParameterTest extends BaseJettyTest {
assertEquals("Header: 123", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedHeaderReceived("id", "");
out = fluentTemplate.to("http://localhost:{{port}}/foo?id=").request(String.class);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java
index 38b876a6dc2..cabf644d7c1 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java
@@ -34,7 +34,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(1);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
@@ -43,7 +43,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/ccc", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(1);
@@ -52,7 +52,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(1);
@@ -61,7 +61,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb/foo", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
@@ -70,7 +70,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb/ccc/", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
@@ -79,7 +79,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb/ccc/foo", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java
index 0cb95e03185..2f0780f9b23 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java
@@ -50,7 +50,7 @@ public class RestJettyGetCorsTest extends BaseJettyTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedMessageCount(1);
// send GET request which should be routed
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
index 964b7677b20..789ce39a83f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
@@ -45,7 +45,7 @@ public class JmsInOnlyDisableTimeToLiveTest extends AbstractJMSTest {
// wait after the msg has expired
Thread.sleep(2500);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:end").expectedMessageCount(0);
cool.someBusinessLogic();
@@ -72,7 +72,7 @@ public class JmsInOnlyDisableTimeToLiveTest extends AbstractJMSTest {
// wait after the msg has expired
Thread.sleep(2500);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:end").expectedBodiesReceived("Hello World 2");
cool.someBusinessLogic();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
index 8fc1829b995..32c93b1b7bc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
@@ -69,7 +69,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
}
private void doSendMessages(int files) throws Exception {
- resetMocks();
+ MockEndpoint.resetMocks(context);
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(files);
mockEndpoint.expectsNoDuplicates(body());
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
index 2f050626ca3..3ec6fc8d79b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
@@ -36,7 +36,7 @@ public class JmsSuspendResumeTest extends AbstractPersistentJMSTest {
context.getRouteController().suspendRoute("JmsSuspendResumeTest");
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
// sleep a bit to ensure its properly suspended
@@ -47,7 +47,7 @@ public class JmsSuspendResumeTest extends AbstractPersistentJMSTest {
MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedBodiesReceived("Bye World");
context.getRouteController().resumeRoute("JmsSuspendResumeTest");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
index fd50b263ce4..ec82133248d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
@@ -84,7 +84,7 @@ public class ManagedJmsSelectorTest extends CamelTestSupport {
// change the selector at runtime
- resetMocks();
+ MockEndpoint.resetMocks(context);
mbeanServer.setAttribute(on, new Attribute("MessageSelector", "brand='softdrink'"));
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
index 48b5d0bf7f2..16d187014a9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
@@ -39,7 +39,7 @@ public class TwoConsumerOnSameQueueTest extends AbstractPersistentJMSTest {
context.getRouteController().stopRoute("a");
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World", "Bye World");
@@ -53,7 +53,7 @@ public class TwoConsumerOnSameQueueTest extends AbstractPersistentJMSTest {
context.getRouteController().startRoute("a");
// send new message should go to both A and B
- resetMocks();
+ MockEndpoint.resetMocks(context);
sendTwoMessagesWhichShouldReceivedOnBothEndpointsAndAssert();
}
@@ -67,7 +67,7 @@ public class TwoConsumerOnSameQueueTest extends AbstractPersistentJMSTest {
assertTrue(context.removeRoute("a"));
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World", "Bye World");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
index 65b1f87554a..4d5fda5ed46 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
@@ -69,7 +69,7 @@ public class TwoConsumerOnSameTopicTest extends AbstractPersistentJMSTest {
context.getRouteController().stopRoute("a");
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World");
@@ -79,7 +79,7 @@ public class TwoConsumerOnSameTopicTest extends AbstractPersistentJMSTest {
MockEndpoint.assertIsSatisfied(context);
// send new message should go to both A and B
- resetMocks();
+ MockEndpoint.resetMocks(context);
// now start route A
context.getRouteController().startRoute("a");
@@ -99,7 +99,7 @@ public class TwoConsumerOnSameTopicTest extends AbstractPersistentJMSTest {
assertTrue(context.removeRoute("a"));
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
index 1d8e7789024..11524677d40 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
@@ -71,7 +71,7 @@ public class DynamicRoutersWithJMSMessageLostHeadersIssueTest extends AbstractJM
template.sendBody("direct:foo", "A");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// actvivemq
getMockEndpoint("mock:checkHeader").expectedMessageCount(1);
diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java
index 296a7cb42c0..3c6d930a6ce 100644
--- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java
+++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java
@@ -50,7 +50,7 @@ public class JoorPreCompileFalseTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
// update file
- resetMocks();
+ MockEndpoint.resetMocks(context);
template.sendBodyAndHeader("file:target?fileExist=Override", "'Bye ' + body", Exchange.FILE_NAME, "update.joor");
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
index 3cbe9633b1b..e24ad589d77 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
@@ -69,7 +69,7 @@ public class JsonPathCBRTest extends CamelTestSupport {
@Test
public void testCheapBicycle() throws Exception {
sendMessageToBicycleRoute("direct:bicycle");
- resetMocks();
+ MockEndpoint.resetMocks(context);
sendMessageToBicycleRoute("direct:bicycle2");
}
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java
index 674fea3cb0b..6dd778983ca 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java
@@ -76,7 +76,7 @@ public class JsonPathStreamCachingCBRTest extends CamelTestSupport {
@Test
public void testCheapBicycle() throws Exception {
sendMessageToBicycleRoute("direct:bicycle");
- resetMocks();
+ MockEndpoint.resetMocks(context);
sendMessageToBicycleRoute("direct:bicycle2");
}
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
index c22473fd4b1..d9062a58ef4 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
@@ -104,7 +104,7 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
// reset
getMBeanServer().invoke(on, "reset", null, null);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:foo").expectedMessageCount(1);
template.sendBody("seda:foo", "Hello Again");
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
index 0c072133c4c..699e1cd56fb 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
@@ -141,7 +141,7 @@ public class MllpIdleTimeoutStrategyTest extends CamelTestSupport {
@BeforeEach
public void setupMock() {
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
private void sendHl7Message(ProducerTemplate template) throws Exception {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java
index 541bfd8ffbe..288fb58edd3 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java
@@ -31,7 +31,7 @@ public class NettyHttpEmptyQueryParameterTest extends BaseNettyTest {
assertEquals("Header: 123", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedHeaderReceived("id", "");
out = fluentTemplate.to("netty-http:http://localhost:{{port}}/foo?id=").request(String.class);
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java
index c28a2eef801..43a1790c496 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java
@@ -43,7 +43,7 @@ public class NettyHttpTwoRoutesStopOneRouteTest extends BaseNettyTest {
// stop foo route
context.getRouteController().stopRoute("foo");
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:foo").expectedMessageCount(0);
getMockEndpoint("mock:bar").expectedBodiesReceived("Hello Camel");
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
index a457c08b511..818e3f1b48c 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
@@ -45,7 +45,7 @@ public class RestNettyHttpGetCorsTest extends BaseNettyTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedMessageCount(1);
// send GET request which should be routed
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
index b7026fb5ad4..51332b01830 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
@@ -49,7 +49,7 @@ public class PubNubStateExample extends CamelTestSupport {
assertNotNull(response.getState());
assertEquals("preben", response.getState().getAsJsonObject().get("name").getAsString());
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(1);
headers.clear();
headers.put(PubNubConstants.OPERATION, "GETSTATE");
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java
index 4c2da1f0454..d6d9441b154 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java
@@ -120,7 +120,7 @@ public class PulsarConsumerPatternInIT extends PulsarITSupport {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// now switch to patterns
context.getRouteController().stopRoute("one");
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
index 555a966df9a..ee7580f4489 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
@@ -36,12 +36,12 @@ public class QuartzStopRouteTest extends BaseQuartzTest {
int size = mock.getReceivedCounter();
assertEquals(1, size, "Should not schedule when stopped");
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
mock.assertIsSatisfied(3000);
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMinimumMessageCount(1);
context.getRouteController().startRoute("foo");
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
index b9677849349..725183e0d15 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
@@ -35,14 +35,14 @@ public class QuartzSuspendRouteTest extends BaseQuartzTest {
int size = mock.getReceivedCounter();
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
mock.assertIsSatisfied(3000);
assertEquals(size, size, "Should not schedule when suspended");
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMinimumMessageCount(1);
context.getRouteController().resumeRoute("foo");
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
index df4745fdfa7..3ef9432209c 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
@@ -37,7 +37,7 @@ public class FileConsumerQuartzSchedulerRestartTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
context.getRouteController().stopRoute("foo");
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(1);
template.sendBodyAndHeader(fileUri(testDirectory), "Bye World", Exchange.FILE_NAME, "bye.txt");
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java
index c85cbf14c19..4f6ef4f387e 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java
@@ -66,14 +66,14 @@ public class RabbitMQSupendResumeIT extends AbstractRabbitMQIT {
// sleep a bit to ensure its properly suspended
Thread.sleep(2000);
- resetMocks();
+ MockEndpoint.resetMocks(context);
resultEndpoint.expectedMessageCount(0);
template.sendBody("Hello2");
MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
resultEndpoint.expectedBodiesReceived("Hello2");
resultEndpoint.expectedMessageCount(1);
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
index 2bf72235568..969c14fb20f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
@@ -58,7 +58,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
// restart
context.stop();
- resetMocks();
+ MockEndpoint.resetMocks(context);
// rebind as the registry is cleared on stop
context.getRegistry().bind("activemqCF", connectionFactory);
@@ -95,7 +95,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
context.suspend();
context.resume();
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:test").expectedMessageCount(1);
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
index 09adcbc9844..b7e27969bc4 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
@@ -53,7 +53,7 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
// restart
context.stop();
- resetMocks();
+ MockEndpoint.resetMocks(context);
// rebind as the registry is cleared on stop
context.getRegistry().bind("activemqCF", connectionFactory);
@@ -88,7 +88,7 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
// restart
context.suspend();
- resetMocks();
+ MockEndpoint.resetMocks(context);
context.resume();
getMockEndpoint("mock:test").expectedMessageCount(1);
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
index 4752af9d7a6..5bff98c080b 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
@@ -50,7 +50,7 @@ public class IssueWithWrongEncodingTest extends CamelTestSupport {
@Test
public void testOkEncoding() throws Exception {
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(1);
File file = new File("src/test/resources/products_with_valid_utf8.xml");
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 07ab9b2e592..32f5e7867e8 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -367,7 +367,7 @@ public abstract class CamelTestSupport
LOG.debug("Reset between test methods");
// and in between tests we must do IoC and reset mocks
postProcessTest();
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
} else {
// test is per test so always setup
@@ -982,13 +982,6 @@ public abstract class CamelTestSupport
return language;
}
- /**
- * Reset all Mock endpoints.
- */
- protected void resetMocks() {
- MockEndpoint.resetMocks(context);
- }
-
protected void assertValidContext(CamelContext context) {
assertNotNull(context, "No context found!");
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
index 3a799486cb6..57c0f0755b8 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
@@ -45,7 +45,7 @@ public class RestUndertowHttpGetCorsTest extends BaseUndertowTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:inputGet").expectedMessageCount(1);
// send GET request which should be routed
@@ -76,7 +76,7 @@ public class RestUndertowHttpGetCorsTest extends BaseUndertowTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:inputPut").expectedMessageCount(1);
// send PUT request which should be routed
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
index c9678ad06c7..719cb54be9b 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
@@ -32,14 +32,14 @@ public class RestUndertowHttpGetOrderingIssueTest extends BaseUndertowTest {
assertEquals("Route without name", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:pippo").expectedMessageCount(1);
out = template.requestBody("undertow:http://localhost:{{port}}/Donald", null, String.class);
assertEquals("Route with name: Donald", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:bar").expectedMessageCount(1);
out = template.requestBody("undertow:http://localhost:{{port}}/bar", null, String.class);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
index 53d5717cebe..86cae5db373 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
@@ -31,7 +31,7 @@ public class RestUndertowHttpMultipleVerbsTest extends BaseUndertowTest {
template.requestBodyAndHeader("undertow:http://localhost:{{port}}/example/123", null, Exchange.HTTP_METHOD, "GET");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:get").expectedMessageCount(0);
getMockEndpoint("mock:put").expectedMessageCount(1);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
index 6220879e41d..c6444cf23f8 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
@@ -32,7 +32,7 @@ public class UndertowHttpEmptyQueryParameterTest extends BaseUndertowTest {
assertEquals("Header: 123", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedHeaderReceived("id", "");
out = fluentTemplate.to("undertow:http://localhost:{{port}}/foo?id=").request(String.class);
diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java
index 23f1401855a..23cde92e570 100644
--- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java
+++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java
@@ -85,7 +85,7 @@ public class VertxKafkaConsumerSuspendResumeTest extends BaseEmbeddedKafkaTest {
// suspend
context.getRouteController().suspendRoute("foo");
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(0);
for (int k = 3; k < 10; k++) {
@@ -97,7 +97,7 @@ public class VertxKafkaConsumerSuspendResumeTest extends BaseEmbeddedKafkaTest {
getMockEndpoint("mock:result").setResultMinimumWaitTime(1000);
MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(7);
// resume
diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java
index 70ca7e9ffb6..2b231984a7f 100644
--- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java
+++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.sax.SAXSource;
-import org.apache.camel.component.mock.MockEndpoint;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -30,6 +29,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java
index 483421ffdf8..a53f0897c64 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java
@@ -37,7 +37,7 @@ public class ZipFileIteratorDataFormatTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// unzip the file
getMockEndpoint("mock:unzip").expectedBodiesReceived("ABCDEF1234567890");
diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java
index 16bc048a499..a10246d1f59 100644
--- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java
+++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java
@@ -123,7 +123,7 @@ public class RouteWatcherReloadStrategyTest extends CamelTestSupport {
template.sendBody("direct:bar", "Hello World");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
LOG.info("Copying file to target/dummy");
@@ -183,7 +183,7 @@ public class RouteWatcherReloadStrategyTest extends CamelTestSupport {
template.sendBody("direct:bar", "Hello World");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// now update the file
LOG.info("Updating file in target/dummy");
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
index 56b2edcb412..836abafc2fc 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
@@ -55,7 +55,7 @@ public class JettyFailoverRoundRobinTest extends CamelTestSupport {
// reset mocks and send a message again to see that round robin
// continue where it should
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:bad").expectedMessageCount(0);
getMockEndpoint("mock:bad2").expectedMessageCount(0);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
index f09caf9179c..c9feb889d0b 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
@@ -62,7 +62,7 @@ public class JettySimulateFailoverRoundRobinTest extends CamelTestSupport {
// reset mocks and send a message again to see that round robin
// continue where it should
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:bad").expectedMessageCount(0);
getMockEndpoint("mock:bad2").expectedMessageCount(0);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
index a952193d328..13c638dae3d 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
@@ -60,7 +60,7 @@ public class JettySpringFailoverRoundRobinTest extends CamelSpringTestSupport {
// reset mocks and send a message again to see that round robin
// continue where it should
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:JettySpringFailoverRoundRobinTestBad").expectedMessageCount(0);
getMockEndpoint("mock:JettySpringFailoverRoundRobinTestBad2").expectedMessageCount(0);