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:58 UTC
[camel] 02/03: (chores) Inlined calls to CamelTestSupport.assertIsSatisfied(long, TimeUnit)
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 b1b15887c3ecc98c01aba5a9107da284ae060c0b
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Sat Oct 1 17:56:19 2022 +0200
(chores) Inlined calls to CamelTestSupport.assertIsSatisfied(long, TimeUnit)
---
.../camel/component/asterisk/AsteriskProducerTest.java | 2 +-
.../integration/consumer/AtmosConsumerGetSingleTest.java | 2 +-
.../integration/producer/AtmosProducerGetFolderTest.java | 2 +-
.../integration/producer/AtmosProducerGetSingleTest.java | 2 +-
.../atmos/integration/producer/AtmosProducerMoveTest.java | 2 +-
.../producer/AtmosProducerPutSingleFileTest.java | 2 +-
.../AtmosProducerPutSingleFileWithRemotePathTest.java | 2 +-
.../dataformat/barcode/BarcodeDataFormatCamelTest.java | 11 ++++++-----
.../couchbase/integration/ConsumeMessagesWithLimitIT.java | 2 +-
.../couchbase/integration/ConsumeResumeStrategyIT.java | 2 +-
.../docker/it/DockerCustomCmdExecFactoryTestIT.java | 2 +-
.../component/docker/it/DockerNettyCmdExecFactoryTest.java | 2 +-
.../camel/component/docker/it/DockerProducerTest.java | 2 +-
.../camel/component/docker/it/DockerStatsConsumerTest.java | 2 +-
.../org/apache/camel/component/drill/ProducerTest.java | 2 +-
.../remote/integration/FromFileToFtpSplitParallelIT.java | 2 +-
.../file/remote/integration/FtpConsumerDoneFileNameIT.java | 2 +-
.../remote/integration/FtpConsumerDualDoneFileNameIT.java | 2 +-
.../component/hazelcast/HazelcastInstanceConsumerTest.java | 4 ++--
.../component/hazelcast/HazelcastListConsumerTest.java | 4 ++--
.../component/hazelcast/HazelcastMapConsumerTest.java | 10 +++++-----
.../component/hazelcast/HazelcastMultimapConsumerTest.java | 6 +++---
.../hazelcast/HazelcastQueueConsumerPollTest.java | 2 +-
.../component/hazelcast/HazelcastQueueConsumerTest.java | 4 ++--
.../hazelcast/HazelcastReliableTopicConsumerTest.java | 2 +-
.../hazelcast/HazelcastReplicatedmapConsumerTest.java | 4 ++--
.../hazelcast/HazelcastSedaRecoverableConsumerTest.java | 2 +-
.../component/hazelcast/HazelcastSetConsumerTest.java | 4 ++--
.../component/hazelcast/HazelcastTopicConsumerTest.java | 2 +-
.../apache/camel/component/iec60870/ConnectionTest.java | 6 +++---
.../component/ironmq/IronMQBatchDeleteConsumerTest.java | 2 +-
.../integrationtest/ConcurrentConsumerLoadManualTest.java | 2 +-
.../component/ironmq/integrationtest/IronMQFIFOTest.java | 2 +-
.../camel/component/ironmq/integrationtest/LoadTest.java | 2 +-
.../integrationtest/Queue2QueueExampleManualTest.java | 3 ++-
.../jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java | 2 +-
.../async/JettyAsyncDefaultContinuationTimeoutTest.java | 3 ++-
.../component/jms/JmsBatchResequencerJMSPriorityTest.java | 2 +-
.../component/jms/JmsDefaultTaskExecutorTypeTest.java | 4 ++--
.../component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java | 2 +-
.../component/jms/JmsInOutFixedReplyQueueTimeoutTest.java | 5 +++--
.../jms/JmsInOutIndividualRequestTimeoutTest.java | 7 ++++---
.../apache/camel/component/jms/JmsPollingConsumerTest.java | 8 ++++----
.../camel/component/jms/JmsProducerConcurrentTest.java | 3 ++-
.../component/jms/JmsProducerConcurrentWithReplyTest.java | 3 ++-
.../jms/JmsRequestReplyTempQueueMultipleConsumersTest.java | 2 +-
.../camel/component/jms/JmsRouteUsingJMSXGroupTest.java | 3 ++-
.../jms/JmsRouteWithInOnlyAndMultipleAcksTest.java | 2 +-
.../apache/camel/component/jms/JmsRouteWithInOnlyTest.java | 2 +-
.../camel/component/jms/JmsRoutingSlipInOutTest.java | 3 ++-
.../apache/camel/component/jms/JmsSuspendResumeTest.java | 2 +-
.../camel/component/jms/JmsTransferExchangeTest.java | 2 +-
.../camel/component/jms/async/AsyncConsumerInOutTest.java | 3 ++-
.../camel/component/jms/async/AsyncJmsInOutTest.java | 2 +-
.../camel/component/jms/issues/JmsInOnlyIssueTest.java | 6 +++---
...msRequestReplyTemporaryRefreshFailureOnStartupTest.java | 2 +-
.../camel/processor/jpa/JpaProducerConcurrentTest.java | 3 ++-
.../LevelDBAggregateNotLostRemovedWhenConfirmedTest.java | 3 ++-
.../component/leveldb/LevelDBAggregateNotLostTest.java | 3 ++-
...LevelDBAggregateRecoverDeadLetterChannelFailedTest.java | 3 ++-
.../component/leveldb/LevelDBAggregateRecoverTest.java | 3 ++-
.../LevelDBAggregateRecoverWithRedeliveryPolicyTest.java | 3 ++-
.../leveldb/LevelDBAggregateRecoverWithSedaTest.java | 3 ++-
.../camel/component/leveldb/LevelDBAggregateTest.java | 2 +-
.../apache/camel/component/leveldb/LevelDBBinaryTest.java | 2 +-
.../component/leveldb/LevelDBCustomSerializationTest.java | 2 +-
...elDBSpringAggregateRecoverWithRedeliveryPolicyTest.java | 3 ++-
.../component/leveldb/LevelDBSpringAggregateTest.java | 2 +-
.../org/apache/camel/component/milo/MonitorItemTest.java | 2 +-
.../camel/component/mllp/MllpIdleTimeoutStrategyTest.java | 2 +-
.../component/mllp/MllpMaxConcurrentConsumersTest.java | 4 ++--
.../mllp/MllpProducerConsumerLoopbackInOnlyTest.java | 2 +-
.../component/mllp/MllpProducerConsumerLoopbackTest.java | 4 ++--
.../mllp/MllpTcpClientProducerConnectionErrorTest.java | 14 +++++++-------
.../MllpTcpClientProducerIdleConnectionTimeoutTest.java | 4 ++--
.../camel/component/mllp/MllpTcpServerCharsetTest.java | 4 ++--
.../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 2 +-
.../mllp/MllpTcpServerConsumerConnectionTest.java | 6 +++---
.../mllp/MllpTcpServerConsumerMessageHeadersTest.java | 4 ++--
.../mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java | 4 ++--
.../mllp/MllpTcpServerConsumerTransactionTest.java | 4 ++--
...TcpClientProducerEndOfDataAndValidationTestSupport.java | 2 +-
.../mllp/TcpServerConsumerAcknowledgementTestSupport.java | 2 +-
...TcpServerConsumerEndOfDataAndValidationTestSupport.java | 4 ++--
.../component/netty/NettyReuseChannelCallbackTest.java | 3 ++-
.../integration/PulsarConsumerDeadLetterPolicyIT.java | 6 +++---
.../component/rabbitmq/integration/RabbitMQLoadIT.java | 2 +-
.../rabbitmq/integration/RabbitMQReConnectionIT.java | 2 +-
.../rabbitmq/integration/RabbitMQSupendResumeIT.java | 2 +-
.../apache/camel/component/sjms/it/AsyncJmsInOutIT.java | 2 +-
.../camel/component/sjms/it/AsyncJmsInOutTempDestIT.java | 2 +-
.../org/apache/camel/component/sjms/it/SyncJmsInOutIT.java | 2 +-
.../camel/component/sjms/it/SyncJmsInOutTempDestIT.java | 2 +-
.../component/sjms/manual/ManualFromQueueManualTest.java | 3 ++-
.../component/sjms/tx/TransactedAsyncExceptionTest.java | 2 +-
.../camel/component/sjms/tx/TransactedConsumerSupport.java | 3 ++-
.../java/org/apache/camel/component/snmp/ProducerTest.java | 2 +-
.../splunk/integration/NormalSearchManualTest.java | 2 +-
.../splunk/integration/SavedSearchManualTest.java | 2 +-
.../springrabbit/integration/RabbitMQConsumerIT.java | 3 ++-
.../integration/RabbitMQConsumerPooledExchangeIT.java | 5 +++--
.../springrabbit/integration/RabbitMQConsumerQueuesIT.java | 7 ++++---
.../integration/RabbitMQConsumerRoutingKeyIT.java | 7 ++++---
.../springrabbit/integration/RabbitMQConsumerTopicIT.java | 7 ++++---
.../springrabbit/integration/RabbitMQInOutIT.java | 3 ++-
.../aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java | 3 ++-
.../jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java | 3 ++-
.../processor/aggregate/jdbc/JdbcAggregateNotLostTest.java | 3 ++-
.../JdbcAggregateRecoverDeadLetterChannelFailedTest.java | 3 ++-
.../processor/aggregate/jdbc/JdbcAggregateRecoverTest.java | 3 ++-
.../jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java | 3 ++-
.../aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java | 3 ++-
.../camel/processor/aggregate/jdbc/JdbcAggregateTest.java | 2 +-
.../jdbc/JdbcRemoveConfirmOrderAggregateTest.java | 3 ++-
...JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java | 3 ++-
.../processor/aggregate/jdbc/JdbcSpringAggregateTest.java | 2 +-
.../apache/camel/component/stream/ScanStreamDelayTest.java | 2 +-
.../org/apache/camel/test/junit5/CamelTestSupport.java | 10 +---------
.../camel/component/undertow/UndertowProducerLeakTest.java | 3 ++-
.../vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java | 2 +-
.../camel/component/weather/BaseWeatherConsumerIT.java | 2 +-
.../java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 3 ++-
122 files changed, 211 insertions(+), 181 deletions(-)
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
index d4ab660a7ca..ce263255f75 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
@@ -39,7 +39,7 @@ public class AsteriskProducerTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java
index cb2b8ac74d8..edc243d75a8 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java
@@ -38,7 +38,7 @@ public class AtmosConsumerGetSingleTest extends AtmosTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(100L, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 100L, TimeUnit.SECONDS);
List<Exchange> exchanges = mock.getReceivedExchanges();
Exchange exchange = exchanges.get(0);
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java
index c6371ca518f..bce52d631b1 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java
@@ -48,7 +48,7 @@ public class AtmosProducerGetFolderTest extends AtmosTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(100L, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 100L, TimeUnit.SECONDS);
List<Exchange> exchanges = mock.getReceivedExchanges();
Exchange exchange = exchanges.get(0);
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java
index ea1dbb7834c..06feb6d7f9e 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java
@@ -45,7 +45,7 @@ public class AtmosProducerGetSingleTest extends AtmosTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(100L, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 100L, TimeUnit.SECONDS);
List<Exchange> exchanges = mock.getReceivedExchanges();
Exchange exchange = exchanges.get(0);
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java
index e33aa308612..7bbdd051870 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java
@@ -45,7 +45,7 @@ public class AtmosProducerMoveTest extends AtmosTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(100L, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 100L, TimeUnit.SECONDS);
List<Exchange> exchanges = mock.getReceivedExchanges();
Exchange exchange = exchanges.get(0);
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java
index 9f0a61279e8..540a2286ac7 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java
@@ -45,7 +45,7 @@ public class AtmosProducerPutSingleFileTest extends AtmosTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(100L, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 100L, TimeUnit.SECONDS);
List<Exchange> exchanges = mock.getReceivedExchanges();
Exchange exchange = exchanges.get(0);
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java
index 98df0b39384..93ebe9c9649 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java
@@ -45,7 +45,7 @@ public class AtmosProducerPutSingleFileWithRemotePathTest extends AtmosTestSuppo
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(100L, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 100L, TimeUnit.SECONDS);
List<Exchange> exchanges = mock.getReceivedExchanges();
Exchange exchange = exchanges.get(0);
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
index 20dddceabae..c89ceb09196 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import com.google.zxing.BarcodeFormat;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -46,7 +47,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
template.sendBody("direct:code1", MSG);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
this.checkImage(image, 100, 100, BarcodeImageType.PNG.toString(), BarcodeFormat.QR_CODE);
}
@@ -63,7 +64,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
template.sendBody("direct:code2", MSG);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
this.checkImage(image, 200, 200, BarcodeImageType.PNG.toString(), BarcodeFormat.QR_CODE);
}
@@ -80,7 +81,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
template.sendBody("direct:code3", MSG);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
this.checkImage(image, 100, 100, "JPEG", BarcodeFormat.QR_CODE);
}
@@ -97,7 +98,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
template.sendBody("direct:code4", MSG);
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
this.checkImage(image, "JPEG", BarcodeFormat.PDF_417);
}
@@ -115,7 +116,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
template.sendBody("direct:code5", MSG);
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
this.checkImage(image, 200, 200, "PNG", BarcodeFormat.AZTEC);
}
diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
index f3832d26b4b..3ad27caa599 100644
--- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
+++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
@@ -40,7 +40,7 @@ public class ConsumeMessagesWithLimitIT extends CouchbaseIntegrationTestBase {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(10);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
index 574416464e7..08fd668fdda 100644
--- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
+++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
@@ -68,7 +68,7 @@ public class ConsumeResumeStrategyIT extends CouchbaseIntegrationTestBase {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(10);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
TestCouchbaseResumeAdapter adapter = resumeStrategy.getAdapter(TestCouchbaseResumeAdapter.class);
await().atMost(30, TimeUnit.SECONDS).until(() -> adapter != null);
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
index 02632e9e228..b7b4f0a0aeb 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
@@ -33,7 +33,7 @@ public class DockerCustomCmdExecFactoryTestIT extends DockerITTestSupport {
template.sendBody("direct:in", "");
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
mock.getExchanges();
}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTest.java
index 1e8926638f5..df9396ea6ed 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTest.java
@@ -34,7 +34,7 @@ public class DockerNettyCmdExecFactoryTest extends DockerITTestSupport {
template.sendBody("direct:in", "");
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTest.java
index e3e88bbb0ee..937606d01a2 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTest.java
@@ -37,7 +37,7 @@ public class DockerProducerTest extends DockerITTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTest.java
index 61f0856f63a..a18cf2a8a55 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTest.java
@@ -36,7 +36,7 @@ public class DockerStatsConsumerTest extends DockerITTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java
index 3839cd0c4bb..7d661ed2af0 100644
--- a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java
+++ b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java
@@ -39,7 +39,7 @@ public class ProducerTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpSplitParallelIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpSplitParallelIT.java
index 25957282f30..6588617987a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpSplitParallelIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpSplitParallelIT.java
@@ -55,7 +55,7 @@ public class FromFileToFtpSplitParallelIT extends FtpServerTestSupport {
context.getRouteController().startAllRoutes();
- assertMockEndpointsSatisfied(1, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.MINUTES);
// use memory profiler
// Thread.sleep(99999999);
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 3c2885446cd..c33e2444f84 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
@@ -42,7 +42,7 @@ public class FtpConsumerDoneFileNameIT extends FtpServerTestSupport {
// wait a bit and it should not pickup the written file as there are no
// done file
- assertMockEndpointsSatisfied(1, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
resetMocks();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDualDoneFileNameIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDualDoneFileNameIT.java
index 6d937764f57..8b310574f20 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDualDoneFileNameIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDualDoneFileNameIT.java
@@ -50,7 +50,7 @@ public class FtpConsumerDualDoneFileNameIT extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "bye.txt");
// give chance to poll 2nd file but it lacks the done file
- assertMockEndpointsSatisfied(1, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
index 0c32790b969..63dcc038df6 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
@@ -76,7 +76,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport {
verify(cluster).addMembershipListener(argument.capture());
MembershipEvent event = new MembershipEvent(cluster, member, MembershipEvent.MEMBER_ADDED, null);
argument.getValue().memberAdded(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
// check headers
Exchange ex = added.getExchanges().get(0);
@@ -97,7 +97,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport {
MembershipEvent event = new MembershipEvent(cluster, member, MembershipEvent.MEMBER_REMOVED, null);
argument.getValue().memberRemoved(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
// check headers
Exchange ex = removed.getExchanges().get(0);
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
index b3054c28147..8e74214bb64 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
@@ -69,7 +69,7 @@ public class HazelcastListConsumerTest extends HazelcastCamelTestSupport {
final ItemEvent<String> event = new ItemEvent<>("mm", ItemEventType.ADDED, "foo", null);
argument.getValue().itemAdded(event);
- assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.ADDED);
}
@@ -83,7 +83,7 @@ public class HazelcastListConsumerTest extends HazelcastCamelTestSupport {
final ItemEvent<String> event = new ItemEvent<>("mm", ItemEventType.REMOVED, "foo", null);
argument.getValue().itemRemoved(event);
- assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.REMOVED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
index 8eb9cfa23dc..8a7fca1da23 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
@@ -67,7 +67,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.ADDED.getType(), "4711", "my-foo");
argument.getValue().entryAdded(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.ADDED);
}
@@ -81,7 +81,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo");
argument.getValue().entryEvicted(event);
- assertMockEndpointsSatisfied(30000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30000, TimeUnit.MILLISECONDS);
}
@Test
@@ -93,7 +93,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.UPDATED.getType(), "4711", "my-foo");
argument.getValue().entryUpdated(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.UPDATED);
}
@@ -107,7 +107,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo");
argument.getValue().entryEvicted(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.EVICTED);
}
@@ -121,7 +121,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.REMOVED.getType(), "4711", "my-foo");
argument.getValue().entryRemoved(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.REMOVED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
index 87782b4e695..1bc194cb149 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
@@ -69,7 +69,7 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.ADDED.getType(), "4711", "my-foo");
argument.getValue().entryAdded(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.ADDED);
}
@@ -86,7 +86,7 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo");
argument.getValue().entryEvicted(event);
- assertMockEndpointsSatisfied(30000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30000, TimeUnit.MILLISECONDS);
}
@Test
@@ -98,7 +98,7 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
EntryEvent<Object, Object> event = new EntryEvent<>("foo", null, EntryEventType.REMOVED.getType(), "4711", "my-foo");
argument.getValue().entryRemoved(event);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.REMOVED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
index 5ab2b103110..ae9357708d2 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
@@ -62,7 +62,7 @@ public class HazelcastQueueConsumerPollTest extends HazelcastCamelTestSupport {
MockEndpoint out = getMockEndpoint("mock:result");
out.expectedMessageCount(1);
- assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
this.checkHeadersAbsence(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.ADDED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
index aae64c0d622..989fa3c5599 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
@@ -74,7 +74,7 @@ public class HazelcastQueueConsumerTest extends HazelcastCamelTestSupport {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
- assertMockEndpointsSatisfied(2, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.SECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.ADDED);
}
@@ -85,7 +85,7 @@ public class HazelcastQueueConsumerTest extends HazelcastCamelTestSupport {
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
- assertMockEndpointsSatisfied(2, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.SECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.REMOVED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
index 406b491c4b3..46b5f0cd358 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
@@ -67,7 +67,7 @@ public class HazelcastReliableTopicConsumerTest extends HazelcastCamelTestSuppor
final Message<String> msg = new Message<>("foo", "foo", new java.util.Date().getTime(), null);
argument.getValue().onMessage(msg);
- assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.RECEIVED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
index 74b86dc13ea..d27da655dcb 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
@@ -67,7 +67,7 @@ public class HazelcastReplicatedmapConsumerTest extends CamelTestSupport {
out.expectedMessageCount(1);
map.put("4711", "my-foo");
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.ADDED);
}
@@ -90,7 +90,7 @@ public class HazelcastReplicatedmapConsumerTest extends CamelTestSupport {
out.expectedMessageCount(1);
map.put("4711", "my-foo");
map.remove("4711");
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.REMOVED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
index 5b0887d7dae..12f93b4fdec 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
@@ -53,7 +53,7 @@ public abstract class HazelcastSedaRecoverableConsumerTest extends HazelcastCame
mock.expectedMessageCount(1);
- assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5000, TimeUnit.MILLISECONDS);
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
index 747628c687b..86df349a9ed 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
@@ -69,7 +69,7 @@ public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport {
final ItemEvent<String> event = new ItemEvent<>("mm", ItemEventType.ADDED, "foo", null);
argument.getValue().itemAdded(event);
- assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.ADDED);
}
@@ -83,7 +83,7 @@ public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport {
final ItemEvent<String> event = new ItemEvent<>("mm", ItemEventType.REMOVED, "foo", null);
argument.getValue().itemRemoved(event);
- assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.REMOVED);
}
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
index cf00c5f2f8f..1bfd04daa4f 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
@@ -67,7 +67,7 @@ public class HazelcastTopicConsumerTest extends HazelcastCamelTestSupport {
final Message<String> msg = new Message<>("foo", "foo", new java.util.Date().getTime(), null);
argument.getValue().onMessage(msg);
- assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.RECEIVED);
}
diff --git a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
index 7db293d7a1a..913e1a54153 100644
--- a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
+++ b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
@@ -97,7 +97,7 @@ public class ConnectionTest extends CamelTestSupport {
// assert
- assertMockEndpointsSatisfied(1_000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 1_000, TimeUnit.MILLISECONDS);
}
@Test
@@ -115,7 +115,7 @@ public class ConnectionTest extends CamelTestSupport {
// assert
- assertMockEndpointsSatisfied(1_000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 1_000, TimeUnit.MILLISECONDS);
}
@Test
@@ -135,7 +135,7 @@ public class ConnectionTest extends CamelTestSupport {
// assert
- assertMockEndpointsSatisfied(2_000, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, 2_000, TimeUnit.MILLISECONDS);
System.out.println(testServer1Endpoint.getExchanges().get(0).getIn().getBody());
}
diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
index 846e39b6b50..80248f352e1 100644
--- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
+++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
@@ -44,7 +44,7 @@ public class IronMQBatchDeleteConsumerTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(5);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
mock.message(0).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(0);
mock.message(1).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(1);
diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java
index 8f1916dd152..e7272b37048 100644
--- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java
+++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java
@@ -85,7 +85,7 @@ public class ConcurrentConsumerLoadManualTest extends CamelTestSupport {
context.getRouteController().startRoute("iron");
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedMessageCount(NO_OF_MESSAGES);
- assertMockEndpointsSatisfied(4, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 4, TimeUnit.MINUTES);
long delta = System.currentTimeMillis() - start;
int seconds = (int) delta / 1000;
int msgPrSec = NO_OF_MESSAGES / seconds;
diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java
index 74b2ea70c76..7c3df11eedd 100644
--- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java
+++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java
@@ -57,7 +57,7 @@ public class IronMQFIFOTest extends CamelTestSupport {
@Test
public void testIronMQFifo() throws Exception {
result.setExpectedMessageCount(50);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
int i = 1;
List<Exchange> exchanges = result.getExchanges();
for (Exchange exchange : exchanges) {
diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java
index 7b746ed85c2..d13cda1974a 100644
--- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java
+++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java
@@ -53,7 +53,7 @@ public class LoadTest extends CamelTestSupport {
MockEndpoint endpoint = getMockEndpoint(datasetEndpoint);
endpoint.expectedMessageCount((int) dataSet.getSize());
- assertMockEndpointsSatisfied(4, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 4, TimeUnit.MINUTES);
}
@Override
diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java
index 37955c5f8fa..a183c2a05cd 100644
--- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java
+++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExampleManualTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.ironmq.IronMQConstants;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -52,7 +53,7 @@ public class Queue2QueueExampleManualTest extends CamelTestSupport {
String payloadToSend = PAYLOAD.replace("#", "" + i);
template.sendBody("direct:start", payloadToSend);
}
- assertMockEndpointsSatisfied(2, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.MINUTES);
}
@Override
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
index 2573052761c..5b4ff75fac8 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
@@ -99,7 +99,7 @@ public class ConcurrentJaxbDataFormatSchemaValidationTest extends CamelTestSuppo
template.sendBody("seda:unmarshall", xml);
}
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
LOG.info("Validation of {} messages took {} ms", testCount, System.currentTimeMillis() - start);
Person person = mockUnmarshall.getExchanges().get(0).getIn().getBody(Person.class);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java
index 3284331b8a6..98ceee96be6 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.util.StopWatch;
import org.junit.jupiter.api.Disabled;
@@ -58,7 +59,7 @@ public class JettyAsyncDefaultContinuationTimeoutTest extends BaseJettyTest {
assertTrue(taken < 34000, "Timeout should occur faster than " + taken);
}
- assertMockEndpointsSatisfied(2, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.MINUTES);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
index ef02ebb03aa..8c70e167ee5 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
@@ -56,7 +56,7 @@ public class JmsBatchResequencerJMSPriorityTest extends AbstractJMSTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("G", "A", "B", "E", "H", "C", "D", "F");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
index 13a4c3edbec..2939838c1b7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
@@ -80,7 +80,7 @@ public class JmsDefaultTaskExecutorTypeTest extends CamelTestSupport {
getMockEndpoint("mock:result.simpleAsync").expectedMessageCount(1000);
doSendMessages("foo.JmsDefaultTaskExecutorTypeTest.simpleAsync", DefaultTaskExecutorType.SimpleAsync);
doSendMessages("foo.JmsDefaultTaskExecutorTypeTest.simpleAsync", DefaultTaskExecutorType.SimpleAsync);
- assertMockEndpointsSatisfied(40, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 40, TimeUnit.SECONDS);
long numberThreadsCreated = currentThreadCount() - beforeThreadCount;
LOG.info("Number of threads created, testSimpleAsyncTaskExecutor: {}", numberThreadsCreated);
assertTrue(numberThreadsCreated >= 800, "Number of threads created should be equal or higher than "
@@ -112,7 +112,7 @@ public class JmsDefaultTaskExecutorTypeTest extends CamelTestSupport {
getMockEndpoint("mock:result.default").expectedMessageCount(1000);
doSendMessages("foo.JmsDefaultTaskExecutorTypeTest.default", DefaultTaskExecutorType.ThreadPool);
doSendMessages("foo.JmsDefaultTaskExecutorTypeTest.default", DefaultTaskExecutorType.ThreadPool);
- assertMockEndpointsSatisfied(40, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 40, TimeUnit.SECONDS);
long numberThreadsCreated = currentThreadCount() - beforeThreadCount;
LOG.info("Number of threads created, testDefaultTaskExecutorThreadPoolAtComponentConfig: " + numberThreadsCreated);
assertTrue(numberThreadsCreated <= 100, "Number of threads created should be equal or lower than "
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java
index 0b233070abc..3202f12a71b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java
@@ -45,7 +45,7 @@ public class JmsInOnlyWithReplyToHeaderTopicTest extends AbstractJMSTest {
exchange.getIn().setHeader("JMSReplyTo", "topic:JmsInOnlyWithReplyToHeaderTopicTest.bar");
});
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
index ab466e6d029..2e78ed4d006 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -48,7 +49,7 @@ public class JmsInOutFixedReplyQueueTimeoutTest extends AbstractJMSTest {
String out = template.requestBody("direct:JmsInOutFixedReplyQueueTimeoutTest", "Camel", String.class);
assertEquals("Bye Camel", out);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -60,7 +61,7 @@ public class JmsInOutFixedReplyQueueTimeoutTest extends AbstractJMSTest {
"Should have thrown exception");
assertIsInstanceOf(ExchangeTimedOutException.class, ex.getCause());
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java
index 3f300e4b311..98ed22f1fc5 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
@@ -40,7 +41,7 @@ public class JmsInOutIndividualRequestTimeoutTest extends AbstractJMSTest {
String out = template.requestBody("direct:JmsInOutIndividualRequestTimeoutTest", "Camel", String.class);
assertEquals("Bye Camel", out);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -56,7 +57,7 @@ public class JmsInOutIndividualRequestTimeoutTest extends AbstractJMSTest {
ExchangeTimedOutException timeout = assertIsInstanceOf(ExchangeTimedOutException.class, ex.getCause());
assertEquals(1500, timeout.getTimeout());
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -68,7 +69,7 @@ public class JmsInOutIndividualRequestTimeoutTest extends AbstractJMSTest {
JmsConstants.JMS_REQUEST_TIMEOUT, 8000L, String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPollingConsumerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPollingConsumerTest.java
index bd0e9cc24d6..07c55e46ba8 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPollingConsumerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPollingConsumerTest.java
@@ -65,7 +65,7 @@ public class JmsPollingConsumerTest extends AbstractJMSTest {
template.sendBody("direct:start.wait", "Hello");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
}
@@ -98,7 +98,7 @@ public class JmsPollingConsumerTest extends AbstractJMSTest {
template.sendBody("direct:start", "Hello");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
}
@@ -128,7 +128,7 @@ public class JmsPollingConsumerTest extends AbstractJMSTest {
template.sendBody("direct:start", "Hello");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
}
@@ -154,7 +154,7 @@ public class JmsPollingConsumerTest extends AbstractJMSTest {
Awaitility.await().atMost(5, TimeUnit.SECONDS)
.until(() -> body != null);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java
index a813c8ad819..0dd0c3dd339 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.body;
@@ -50,7 +51,7 @@ public class JmsProducerConcurrentTest extends AbstractJMSTest {
return null;
});
}
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
} finally {
executor.shutdownNow();
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java
index 4586cf5f3cb..d8365c57648 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@@ -63,7 +64,7 @@ public class JmsProducerConcurrentWithReplyTest extends AbstractJMSTest {
futures.add(out);
}
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
for (int i = 0; i < futures.size(); i++) {
Object out = futures.get(i).get(5, TimeUnit.SECONDS);
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 be331acf16a..8fc1829b995 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
@@ -82,7 +82,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
});
}
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
index f632c503f36..1ed2e9d6327 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +63,7 @@ public class JmsRouteUsingJMSXGroupTest extends AbstractJMSTest {
});
}
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@BeforeEach
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
index 89dc7566b48..54b89b37af1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
@@ -60,7 +60,7 @@ public class JmsRouteWithInOnlyAndMultipleAcksTest extends AbstractJMSTest {
"JMSCorrelationID", orderId);
assertEquals("OK: Camel in Action", out);
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
index 07cd45474cb..896250caa00 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
@@ -51,7 +51,7 @@ public class JmsRouteWithInOnlyTest extends AbstractJMSTest {
Object out = template.requestBody("activemq:queue:JmsRouteWithInOnlyTest", "Camel in Action");
assertEquals("OK: Camel in Action", out);
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
// assert MEP
assertEquals(ExchangePattern.InOut, inbox.getReceivedExchanges().get(0).getPattern());
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
index b4a277332c9..da20b7d30dc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Headers;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@@ -38,7 +39,7 @@ public class JmsRoutingSlipInOutTest extends AbstractJMSTest {
template.sendBody("activemq:queue:JmsRoutingSlipInOutTest.start", "Hello");
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Override
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 444b058b1b1..2f050626ca3 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
@@ -45,7 +45,7 @@ public class JmsSuspendResumeTest extends AbstractPersistentJMSTest {
template.sendBody("activemq:queue:JmsSuspendResumeTest", "Bye World");
- assertMockEndpointsSatisfied(1, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
resetMocks();
mock.expectedBodiesReceived("Bye World");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java
index 2bd4ed6c551..c0b78ce76c7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java
@@ -65,7 +65,7 @@ public class JmsTransferExchangeTest extends AbstractJMSTest {
exchange.setProperty("bar", 123);
});
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
index 6d41c455cfb..ad4ad340b5f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.component.mock.MockEndpoint;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -47,7 +48,7 @@ public class AsyncConsumerInOutTest extends AbstractJMSTest {
template.sendBody("activemq:queue:AsyncConsumerInOutTest.start", "Hello Camel");
template.sendBody("activemq:queue:AsyncConsumerInOutTest.start", "Hello World");
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
index 636137f915b..5e4649dcadf 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
@@ -51,7 +51,7 @@ public class AsyncJmsInOutTest extends AbstractJMSTest {
}
// just in case we run on slow boxes
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
LOG.info("Took {} ms. to process 100 messages request/reply over JMS", watch.taken());
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
index 4abf9f1a2a8..a98ab44266e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
@@ -38,7 +38,7 @@ public class JmsInOnlyIssueTest extends AbstractJMSTest {
template.sendBody("activemq:queue:JmsInOnlyIssueTest.in", "Hello World");
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Test
@@ -52,7 +52,7 @@ public class JmsInOnlyIssueTest extends AbstractJMSTest {
assertDoesNotThrow(() -> future.get(5, TimeUnit.SECONDS));
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Test
@@ -85,7 +85,7 @@ public class JmsInOnlyIssueTest extends AbstractJMSTest {
assertDoesNotThrow(() -> future.get(5, TimeUnit.SECONDS));
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
index 0db9fe1f230..51f1ea9c5bb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
@@ -98,7 +98,7 @@ public class JmsRequestReplyTemporaryRefreshFailureOnStartupTest extends CamelTe
template.asyncRequestBody("direct:start", "ping");
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
service.shutdown();
}
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
index bab2be2333a..661909c6fea 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -69,7 +70,7 @@ public class JpaProducerConcurrentTest extends AbstractJpaTest {
responses.put(index, out);
}
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
assertEquals(files, responses.size());
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
index d46bcb6c8f0..f802577235f 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.params.Test;
import org.awaitility.Awaitility;
import org.hamcrest.Matchers;
@@ -56,7 +57,7 @@ public class LevelDBAggregateNotLostRemovedWhenConfirmedTest extends LevelDBTest
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
final List<Exchange> receivedExchanges = Awaitility.await().atMost(1, TimeUnit.SECONDS)
.until(() -> getMockEndpoint("mock:result").getReceivedExchanges(), Matchers.notNullValue());
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java
index e51eaddcc06..ff2c0009bcb 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.params.Test;
import org.awaitility.Awaitility;
import org.hamcrest.Matchers;
@@ -54,7 +55,7 @@ public class LevelDBAggregateNotLostTest extends LevelDBTestSupport {
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
final List<Exchange> receivedExchanges = Awaitility.await().atMost(1, TimeUnit.SECONDS)
.until(() -> getMockEndpoint("mock:aggregated").getReceivedExchanges(), Matchers.notNullValue());
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java
index e7f9d40a5ec..93469c397b9 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.params.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -66,7 +67,7 @@ public class LevelDBAggregateRecoverDeadLetterChannelFailedTest extends LevelDBT
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
// all the details should be the same about redelivered and redelivered 2 times
Exchange first = getMockEndpoint("mock:dead").getReceivedExchanges().get(0);
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java
index b1fee1e250c..3b27484732b 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.params.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -72,7 +73,7 @@ public class LevelDBAggregateRecoverTest extends LevelDBTestSupport {
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
index c3b49a88d6c..478947b2127 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.params.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -76,7 +77,7 @@ public class LevelDBAggregateRecoverWithRedeliveryPolicyTest extends LevelDBTest
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java
index d6d06aa8e77..2d04daa5a8f 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.params.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -69,7 +70,7 @@ public class LevelDBAggregateRecoverWithSedaTest extends LevelDBTestSupport {
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java
index 886434e0145..8400f21b161 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java
@@ -51,7 +51,7 @@ public class LevelDBAggregateTest extends LevelDBTestSupport {
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
// from endpoint should be preserved
assertEquals("direct://start", mock.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java
index 509c52509be..d6d28bc37c8 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBinaryTest.java
@@ -64,7 +64,7 @@ public class LevelDBBinaryTest extends LevelDBTestSupport {
template.sendBodyAndHeader("direct:start", b, "id", 123);
template.sendBodyAndHeader("direct:start", c, "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
// from endpoint should be preserved
assertEquals("direct://start", mock.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java
index 64f5942d25e..51bf2918392 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBCustomSerializationTest.java
@@ -68,7 +68,7 @@ public class LevelDBCustomSerializationTest extends CamelTestSupport {
template.sendBodyAndHeader("direct:start", objectB, "id", 123);
template.sendBodyAndHeader("direct:start", objectC, "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
// from endpoint should be preserved
assertEquals("direct://start", mock.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
index a6fade30b27..7d750372d3c 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -69,7 +70,7 @@ public class LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest extends Camel
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
public static class MyFailProcessor implements Processor {
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java
index 51b8abe3196..3b9381da236 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java
@@ -57,7 +57,7 @@ public class LevelDBSpringAggregateTest extends CamelSpringTestSupport {
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
public static class MyAggregationStrategy implements AggregationStrategy {
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
index 68c6e13a9ab..7820d3387c2 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
@@ -104,6 +104,6 @@ public class MonitorItemTest extends AbstractMiloServerTest {
testBody(this.test1Endpoint.message(2), assertGoodValue("Baz"));
// assert
- assertMockEndpointsSatisfied(time, TimeUnit.MILLISECONDS);
+ MockEndpoint.assertIsSatisfied(context, time, TimeUnit.MILLISECONDS);
}
}
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 66a53332e87..0c072133c4c 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
@@ -149,7 +149,7 @@ public class MllpIdleTimeoutStrategyTest extends CamelTestSupport {
// Need to send one message to get the connection established
template.sendBody(Hl7TestMessageGenerator.generateMessage());
Thread.sleep(IDLE_TIMEOUT * 3);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Test
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
index bc714871781..ebbbf6dc517 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
@@ -84,7 +84,7 @@ public class MllpMaxConcurrentConsumersTest extends CamelTestSupport {
String testMessage = "MSH|^~\\&|ADT|EPIC|JCAPS|CC|20160902123950|RISTECH|ADT^A08|00001|D|2.3|||||||" + '\r' + '\n';
mllpClient.sendMessageAndWaitForAcknowledgement(testMessage, 10000);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
@Test
@@ -97,7 +97,7 @@ public class MllpMaxConcurrentConsumersTest extends CamelTestSupport {
String testMessage = "MSH|^~\\&|ADT|EPIC|JCAPS|CC|20160902123950|RISTECH|ADT^A08|00001|D|2.3|||||||" + '\r' + '\n';
mllpClient.sendMessageAndWaitForAcknowledgement(testMessage, 10000);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
// second connection should fail
assertThrows(MllpJUnitResourceException.class,
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
index f6fc740f1c0..b51e39a4139 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
@@ -86,6 +86,6 @@ public class MllpProducerConsumerLoopbackInOnlyTest extends CamelTestSupport {
String acknowledgement = source.requestBody((Object) testMessage, String.class);
assertThat("Should receive no acknowledgment for message 1", acknowledgement, CoreMatchers.nullValue());
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
index 6d300bb7be7..5b718f05798 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
@@ -105,7 +105,7 @@ public class MllpProducerConsumerLoopbackTest extends CamelTestSupport {
assertThat("Should be acknowledgment for message 1", acknowledgement,
CoreMatchers.containsString(String.format("MSA|AA|00001")));
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
}
@Test
@@ -122,6 +122,6 @@ public class MllpProducerConsumerLoopbackTest extends CamelTestSupport {
CoreMatchers.containsString(String.format("MSA|AA|%05d", i)));
}
- assertMockEndpointsSatisfied(60, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 60, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
index aff87d62363..25b08fc7ce6 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
@@ -132,7 +132,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
assertTrue(twoDone.matches(5, TimeUnit.SECONDS), "Should have completed two exchanges");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
/**
@@ -160,7 +160,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
source.sendBody(Hl7TestMessageGenerator.generateMessage());
assertTrue(twoDone.matches(5, TimeUnit.SECONDS), "Should have completed two exchanges");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Test()
@@ -179,7 +179,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Test()
@@ -198,7 +198,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Test()
@@ -218,7 +218,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
// Depending on the timing, either a write or a receive exception will be thrown
assertEquals(1, writeEx.getExchanges().size() + acknowledgementEx.getExchanges().size(),
@@ -243,7 +243,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
// Depending on the timing, either a write or a receive exception will be thrown
assertEquals(1, writeEx.getExchanges().size() + acknowledgementEx.getExchanges().size(),
@@ -270,7 +270,7 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed an exchange");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
index 54044d4dabb..2832aaaf58f 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
@@ -119,7 +119,7 @@ public class MllpTcpClientProducerIdleConnectionTimeoutTest extends CamelTestSup
assertTrue(done.matches(5, TimeUnit.SECONDS), "Should have completed two exchanges");
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
Thread.sleep((long) (IDLE_TIMEOUT * 1.1));
@@ -154,7 +154,7 @@ public class MllpTcpClientProducerIdleConnectionTimeoutTest extends CamelTestSup
source.sendBody(Hl7TestMessageGenerator.generateMessage());
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
log.debug("Breakpoint");
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
index d826e4c7ae3..15bf1f93364 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
@@ -89,7 +89,7 @@ public class MllpTcpServerCharsetTest extends CamelTestSupport {
mllpClient.sendMessageAndWaitForAcknowledgement(TEST_MESSAGE);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Test
@@ -100,6 +100,6 @@ public class MllpTcpServerCharsetTest extends CamelTestSupport {
mllpClient.sendMessageAndWaitForAcknowledgement(TEST_MESSAGE.replace("ISO_IR 100", "ISO-IR-100"));
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
index 958bd8a0699..b5c3cba4c3f 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
@@ -109,7 +109,7 @@ public class MllpTcpServerConsumerBindTimeoutTest extends CamelTestSupport {
mllpClient.sendMessageAndWaitForAcknowledgement(Hl7TestMessageGenerator.generateMessage(), 10000);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
index d8e9cf960e3..9e07b4a3b8f 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
@@ -92,7 +92,7 @@ public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport {
Thread.sleep(1000);
mllpClient.close();
- assertMockEndpointsSatisfied(15, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 15, TimeUnit.SECONDS);
}
@Test
@@ -116,7 +116,7 @@ public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport {
Thread.sleep(1000);
mllpClient.reset();
- assertMockEndpointsSatisfied(15, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 15, TimeUnit.SECONDS);
}
/**
@@ -146,7 +146,7 @@ public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport {
assertNull(expectedEx.getCause());
}
- assertMockEndpointsSatisfied(15, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 15, TimeUnit.SECONDS);
}
void addTestRouteWithIdleTimeout(final int idleTimeout) throws Exception {
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
index 0c25b7cf321..a5cb14d2614 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
@@ -92,7 +92,7 @@ public class MllpTcpServerConsumerMessageHeadersTest extends CamelTestSupport {
mllpClient.sendMessageAndWaitForAcknowledgement(testMessage, 10000);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
Message message = result.getExchanges().get(0).getIn();
@@ -114,7 +114,7 @@ public class MllpTcpServerConsumerMessageHeadersTest extends CamelTestSupport {
mllpClient.sendMessageAndWaitForAcknowledgement(testMessage, 10000);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
Message message = result.getExchanges().get(0).getIn();
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
index 9541f92be6d..db73599e8e2 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
@@ -92,7 +92,7 @@ public class MllpTcpServerConsumerMulitpleTcpPacketTest extends CamelTestSupport
mllpClient.sendFramedDataInMultiplePackets(message, (byte) '\r');
String acknowledgement = mllpClient.receiveFramedData();
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
assertThat("Should be acknowledgment for message 1", acknowledgement,
CoreMatchers.containsString(String.format("MSA|AA|00001")));
@@ -115,7 +115,7 @@ public class MllpTcpServerConsumerMulitpleTcpPacketTest extends CamelTestSupport
CoreMatchers.containsString(String.format("MSA|AA|%05d", i)));
}
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
index bceae6312ce..19cfb7acf80 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
@@ -131,7 +131,7 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
mllpClient.sendMessageAndWaitForAcknowledgement(Hl7TestMessageGenerator.generateMessage(), 10000);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
@Test
@@ -146,6 +146,6 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage(), true);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
index bc102be4b93..77c02e18905 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
@@ -178,7 +178,7 @@ public abstract class TcpClientProducerEndOfDataAndValidationTestSupport extends
@Override
public void tearDown() throws Exception {
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
super.tearDown();
}
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
index adeef6654b8..1bedbd0e98c 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
@@ -147,7 +147,7 @@ public abstract class TcpServerConsumerAcknowledgementTestSupport extends CamelT
mllpClient.sendFramedData(TEST_MESSAGE, disconnectAfterSend);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
}
public void unparsableMessage(String testMessage) throws Exception {
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
index f7b10601b1a..5f907958daa 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
@@ -118,7 +118,7 @@ public abstract class TcpServerConsumerEndOfDataAndValidationTestSupport extends
@Override
public void tearDown() throws Exception {
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
super.tearDown();
}
@@ -203,7 +203,7 @@ public abstract class TcpServerConsumerEndOfDataAndValidationTestSupport extends
assertTrue(notify2.matches(RECEIVE_TIMEOUT, TimeUnit.MILLISECONDS), "Remaining exchanges did not complete");
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
assertTrue(acknowledgement1.contains("MSA|AA|00001"), "Should be acknowledgment for message 1");
assertTrue(acknowledgement2.contains("MSA|AA|00002"), "Should be acknowledgment for message 2");
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelCallbackTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelCallbackTest.java
index eb485958196..218f0e20b76 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelCallbackTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelCallbackTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.event.ExchangeSentEvent;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.ExchangeSendingEvent;
@@ -86,7 +87,7 @@ class NettyReuseChannelCallbackTest extends BaseNettyTest {
template.sendBody("direct:start", "World\n");
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
assertTrue(notify.matchesWaitTime());
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerDeadLetterPolicyIT.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerDeadLetterPolicyIT.java
index 8b2223a5796..6e5e24f9e47 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerDeadLetterPolicyIT.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerDeadLetterPolicyIT.java
@@ -132,7 +132,7 @@ public class PulsarConsumerDeadLetterPolicyIT extends PulsarITSupport {
});
producer.send("Hello World!");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -158,7 +158,7 @@ public class PulsarConsumerDeadLetterPolicyIT extends PulsarITSupport {
});
producer.send("Hello World!");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -191,7 +191,7 @@ public class PulsarConsumerDeadLetterPolicyIT extends PulsarITSupport {
});
producer.send("Hello World!");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
private PulsarClient givenPulsarClient() throws PulsarClientException {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIT.java
index 0cd879a244f..93e4dd0943b 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIT.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIT.java
@@ -94,6 +94,6 @@ public class RabbitMQLoadIT extends AbstractRabbitMQIT {
// Check message count
producingMockEndpoint.expectedMessageCount(PRODUCER_COUNT * MESSAGE_COUNT);
consumingMockEndpoint.expectedMessageCount(PRODUCER_COUNT * MESSAGE_COUNT);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIT.java
index a7ca0b0a24c..647ce7c5d5c 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIT.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIT.java
@@ -89,6 +89,6 @@ public class RabbitMQReConnectionIT extends AbstractRabbitMQIT {
}
producingMockEndpoint.expectedMessageCount(nbMessages - failedMessages);
consumingMockEndpoint.expectedMessageCount(nbMessages - failedMessages);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
}
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 0494fc0d93a..c85cbf14c19 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
@@ -71,7 +71,7 @@ public class RabbitMQSupendResumeIT extends AbstractRabbitMQIT {
template.sendBody("Hello2");
- assertMockEndpointsSatisfied(1, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
resetMocks();
resultEndpoint.expectedBodiesReceived("Hello2");
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
index 2d3149a192c..e7bf88b7855 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
@@ -45,7 +45,7 @@ public class AsyncJmsInOutIT extends JmsTestSupport {
}
// just in case we run on slow boxes
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
index 7d8682ce9b6..c38c7f70c9f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
@@ -45,7 +45,7 @@ public class AsyncJmsInOutTempDestIT extends JmsTestSupport {
}
// just in case we run on slow boxes
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
index 60b5c51aea3..8f106fa2e34 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
@@ -45,7 +45,7 @@ public class SyncJmsInOutIT extends JmsTestSupport {
}
// just in case we run on slow boxes
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
index 1a020210fba..0d851ab659f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
@@ -45,7 +45,7 @@ public class SyncJmsInOutTempDestIT extends JmsTestSupport {
}
// just in case we run on slow boxes
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java
index 3c2c93df09b..ba97e05a331 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueManualTest.java
@@ -22,6 +22,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
@@ -55,7 +56,7 @@ public class ManualFromQueueManualTest extends CamelTestSupport {
public void testConsume() throws Exception {
getMockEndpoint("mock:foo").expectedMinimumMessageCount(3);
- assertMockEndpointsSatisfied(1, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.MINUTES);
}
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
index 6ca71c0f9dc..14dc1e96ac0 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
@@ -70,7 +70,7 @@ public class TransactedAsyncExceptionTest extends CamelTestSupport {
if (!mockEndpoint.await(getShutdownTimeout(), TimeUnit.SECONDS)) {
dumpThreads();
}
- assertMockEndpointsSatisfied(getShutdownTimeout(), TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, getShutdownTimeout(), TimeUnit.SECONDS);
}
private void dumpThreads() {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
index 613055423e2..ef2cfe42a3b 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.slf4j.Logger;
@@ -67,7 +68,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport {
// Await on our countdown for 30 seconds at most then move on
latch.await(30, TimeUnit.SECONDS);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
index 78b10b2e8fc..ee24f56ddfb 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
@@ -38,7 +38,7 @@ public class ProducerTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchManualTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchManualTest.java
index bc7a2249814..72f3b3f8232 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchManualTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchManualTest.java
@@ -37,7 +37,7 @@ public class NormalSearchManualTest extends SplunkTest {
searchMock.expectedMessageCount(1);
getMockEndpoint("mock:submit-result").expectedMessageCount(1);
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
SplunkEvent received = searchMock.getReceivedExchanges().get(0).getIn().getBody(SplunkEvent.class);
assertNotNull(received);
Map<String, String> data = received.getEventData();
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchManualTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchManualTest.java
index 965c608dbd5..3809848529c 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchManualTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchManualTest.java
@@ -38,7 +38,7 @@ public class SavedSearchManualTest extends SplunkTest {
MockEndpoint searchMock = getMockEndpoint("mock:search-saved");
searchMock.expectedMessageCount(1);
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
SplunkEvent received = searchMock.getReceivedExchanges().get(0).getIn().getBody(SplunkEvent.class);
assertNotNull(received);
Map<String, String> data = received.getEventData();
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerIT.java
index a8c484101cc..2c54d278035 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerIT.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class RabbitMQConsumerIT extends RabbitMQITSupport {
@@ -30,7 +31,7 @@ public class RabbitMQConsumerIT extends RabbitMQITSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerPooledExchangeIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerPooledExchangeIT.java
index 31b21e50f4a..622569867b3 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerPooledExchangeIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerPooledExchangeIT.java
@@ -22,6 +22,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.engine.PooledExchangeFactory;
import org.junit.jupiter.api.Test;
@@ -40,7 +41,7 @@ public class RabbitMQConsumerPooledExchangeIT extends RabbitMQITSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -50,7 +51,7 @@ public class RabbitMQConsumerPooledExchangeIT extends RabbitMQITSupport {
template.sendBody("direct:start", "Hello World");
template.sendBody("direct:start", "Bye World");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerQueuesIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerQueuesIT.java
index 0ee67c41224..21c5f718cd3 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerQueuesIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerQueuesIT.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageBuilder;
@@ -35,7 +36,7 @@ public class RabbitMQConsumerQueuesIT extends RabbitMQITSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -45,7 +46,7 @@ public class RabbitMQConsumerQueuesIT extends RabbitMQITSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "cheese", "gouda");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -65,7 +66,7 @@ public class RabbitMQConsumerQueuesIT extends RabbitMQITSupport {
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerRoutingKeyIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerRoutingKeyIT.java
index b3bd41147ed..8d3a0475f7b 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerRoutingKeyIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerRoutingKeyIT.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageBuilder;
@@ -34,7 +35,7 @@ public class RabbitMQConsumerRoutingKeyIT extends RabbitMQITSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -44,7 +45,7 @@ public class RabbitMQConsumerRoutingKeyIT extends RabbitMQITSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "cheese", "gouda");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -63,7 +64,7 @@ public class RabbitMQConsumerRoutingKeyIT extends RabbitMQITSupport {
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerTopicIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerTopicIT.java
index aebc227aa57..f577a52b79c 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerTopicIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerTopicIT.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageBuilder;
@@ -34,7 +35,7 @@ public class RabbitMQConsumerTopicIT extends RabbitMQITSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -44,7 +45,7 @@ public class RabbitMQConsumerTopicIT extends RabbitMQITSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "cheese", "gouda");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Test
@@ -63,7 +64,7 @@ public class RabbitMQConsumerTopicIT extends RabbitMQITSupport {
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQInOutIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQInOutIT.java
index 46663bb7a5d..0598971fc85 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQInOutIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQInOutIT.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.ExchangePattern;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class RabbitMQInOutIT extends RabbitMQITSupport {
@@ -32,7 +33,7 @@ public class RabbitMQInOutIT extends RabbitMQITSupport {
template.requestBody("direct:start", "World");
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java
index 45bcd288613..1bf5bb3456d 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregateRecoverTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class ClusteredJdbcAggregateRecoverTest extends AbstractClusteredJdbcAggregationTestSupport {
@@ -59,7 +60,7 @@ public class ClusteredJdbcAggregateRecoverTest extends AbstractClusteredJdbcAggr
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
index 39a63b98226..3173ccdb2e3 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.awaitility.Awaitility.await;
@@ -36,7 +37,7 @@ public class JdbcAggregateNotLostRemovedWhenConfirmedTest extends AbstractJdbcAg
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
String exchangeId = getMockEndpoint("mock:result").getReceivedExchanges().get(0).getExchangeId();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
index 4b02ee66664..4a63689f741 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,7 +39,7 @@ public class JdbcAggregateNotLostTest extends AbstractJdbcAggregationTestSupport
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
String exchangeId = getMockEndpoint("mock:aggregated").getReceivedExchanges().get(0).getExchangeId();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java
index ee98a4969a0..264fb0aad65 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverDeadLetterChannelFailedTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class JdbcAggregateRecoverDeadLetterChannelFailedTest extends AbstractJdbcAggregationTestSupport {
@@ -52,7 +53,7 @@ public class JdbcAggregateRecoverDeadLetterChannelFailedTest extends AbstractJdb
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java
index de4090f4fd1..1a4f9f463c8 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class JdbcAggregateRecoverTest extends AbstractJdbcAggregationTestSupport {
@@ -52,7 +53,7 @@ public class JdbcAggregateRecoverTest extends AbstractJdbcAggregationTestSupport
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java
index 8a2f2ce346d..e26719f091b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithRedeliveryPolicyTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class JdbcAggregateRecoverWithRedeliveryPolicyTest extends AbstractJdbcAggregationTestSupport {
@@ -55,7 +56,7 @@ public class JdbcAggregateRecoverWithRedeliveryPolicyTest extends AbstractJdbcAg
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java
index 64a9b7c98f9..93e5160e363 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateRecoverWithSedaTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class JdbcAggregateRecoverWithSedaTest extends AbstractJdbcAggregationTestSupport {
@@ -52,7 +53,7 @@ public class JdbcAggregateRecoverWithSedaTest extends AbstractJdbcAggregationTes
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java
index d20fe00de6a..f20cad1b34c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateTest.java
@@ -37,7 +37,7 @@ public class JdbcAggregateTest extends AbstractJdbcAggregationTestSupport {
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
// from endpoint should be preserved
assertEquals("direct://start", mock.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
index 8c93ae79627..16c4dd7bd87 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
@@ -26,6 +26,7 @@ import javax.sql.DataSource;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -94,7 +95,7 @@ public class JdbcRemoveConfirmOrderAggregateTest extends AbstractJdbcAggregation
template.sendBodyAndHeader("direct:start", "A", "id", 123);
template.sendBodyAndHeader("direct:start", "B", "id", 123);
- assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 10, TimeUnit.SECONDS);
// Wait until the recovery has been run
await().atMost(500, TimeUnit.MILLISECONDS).until(this::checkCompletedNotPresent);
Assertions.assertEquals(1, JdbcRemoveConfirmOrderAggregateTest.completedExchangeCount,
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java
index 6009c7fa4f0..bea6ff78f18 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -54,7 +55,7 @@ public class JdbcSpringAggregateRecoverWithRedeliveryPolicyTest extends CamelSpr
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
public static class MyFailProcessor implements Processor {
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java
index 68c2e1ee6b4..ff7aed2149c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java
@@ -42,6 +42,6 @@ public class JdbcSpringAggregateTest extends CamelSpringTestSupport {
template.sendBodyAndHeader("direct:start", "D", "id", 123);
template.sendBodyAndHeader("direct:start", "E", "id", 123);
- assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
}
}
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java
index 1ad3ec8826d..01ec5bf5237 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java
@@ -60,7 +60,7 @@ public class ScanStreamDelayTest extends CamelTestSupport {
public void testScanFile() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(6);
- assertMockEndpointsSatisfied(1, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
}
@Override
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 5c822ba6731..07ab9b2e592 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
@@ -21,7 +21,6 @@ import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
@@ -979,17 +978,10 @@ public abstract class CamelTestSupport
*/
protected Language assertResolveLanguage(String languageName) {
Language language = context.resolveLanguage(languageName);
- assertNotNull(language, "No language found for name: " + languageName);
+ assertNotNull(language, "Nog language found for name: " + languageName);
return language;
}
- /**
- * Asserts that all the expectations of the Mock endpoints are valid
- */
- protected void assertMockEndpointsSatisfied(long timeout, TimeUnit unit) throws InterruptedException {
- MockEndpoint.assertIsSatisfied(context, timeout, unit);
- }
-
/**
* Reset all Mock endpoints.
*/
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java
index ae133c97fdc..6de70990b05 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.undertow;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class UndertowProducerLeakTest extends BaseUndertowTest {
@@ -27,7 +28,7 @@ public class UndertowProducerLeakTest extends BaseUndertowTest {
public void testLeak() throws Exception {
getMockEndpoint("mock:result").expectedMinimumMessageCount(50);
- assertMockEndpointsSatisfied(2, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.MINUTES);
}
@Override
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 f56aca5735c..23f1401855a 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
@@ -95,7 +95,7 @@ public class VertxKafkaConsumerSuspendResumeTest extends BaseEmbeddedKafkaTest {
}
getMockEndpoint("mock:result").setResultMinimumWaitTime(1000);
- assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
resetMocks();
getMockEndpoint("mock:result").expectedMessageCount(7);
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java
index b9e763bf682..f3fbc0f6ee4 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerIT.java
@@ -51,7 +51,7 @@ public abstract class BaseWeatherConsumerIT extends CamelTestSupport {
mock.expectedMessageCount(1);
// give the route a bit time to start and fetch the weather info
- assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
Exchange exchange = mock.getExchanges().get(0);
assertNotNull(exchange);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
index b7f17f3f117..01e170fd71d 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.AvailablePortFinder;
@@ -45,7 +46,7 @@ public class JmsJettyAsyncTest extends CamelTestSupport {
template.sendBody("activemq:queue:inbox", "" + i);
}
- assertMockEndpointsSatisfied(2, TimeUnit.MINUTES);
+ MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.MINUTES);
}
@Override