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:56 UTC
[camel] branch main updated (6ae7c461907 -> ef9e711e5ab)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 6ae7c461907 Regen
new d8facdb0b14 (chores) Inlined calls to CamelTestSupport.assertIsSatisfied()
new b1b15887c3e (chores) Inlined calls to CamelTestSupport.assertIsSatisfied(long, TimeUnit)
new ef9e711e5ab (chores) Inlined calls to CamelTestSupport.resetMocks
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../parser/java/MyLocalAddRouteBuilderTest.java | 3 +-
.../camel/parser/java/RoasterJavaDslTest.java | 3 +-
.../parser/java/RoasterJavaDslTwoRoutesTest.java | 3 +-
.../camel/parser/java/SplitTokenizeTest.java | 14 +--
...tiveMQComponentFactoryUserNamePasswordTest.java | 3 +-
.../ActiveMQComponentUserNamePasswordTest.java | 3 +-
.../activemq/ActiveMQOriginalDestinationTest.java | 2 +-
.../component/activemq/PoisonJMSPayloadTest.java | 3 +-
.../apache/camel/component/amqp/AMQPToDTest.java | 3 +-
...1DataFormatWithStreamIteratorByteArrayTest.java | 3 +-
.../ASN1DataFormatWithStreamIteratorClassTest.java | 9 +-
.../asn1/ASN1DataFormatWithStreamTest.java | 3 +-
.../asn1/SpringASN1DataFormatRouteTest.java | 3 +-
.../component/asterisk/AsteriskProducerTest.java | 2 +-
.../atlasmap/AtlasMapExtractMappingsTest.java | 4 +-
.../atlasmap/AtlasMapForceReloadTest.java | 8 +-
.../component/atlasmap/AtlasMapJavaToJsonTest.java | 2 +-
.../camel/component/atlasmap/AtlasMapJsonTest.java | 2 +-
.../component/atlasmap/AtlasMapJsonToJavaTest.java | 2 +-
.../atlasmap/AtlasMapJsonToXmlSchemaTest.java | 2 +-
.../component/atlasmap/AtlasMapMultiDocsTest.java | 8 +-
.../component/atlasmap/AtlasMapMultiNSTest.java | 2 +-
.../component/atlasmap/AtlasMapSingleDocTest.java | 2 +-
.../camel/component/atlasmap/AtlasMapTest.java | 2 +-
.../atlasmap/AtlasMapXmlToXmlDefaultNsTest.java | 2 +-
.../component/atlasmap/AtlasMapXmlToXmlTest.java | 2 +-
.../consumer/AtmosConsumerGetSingleTest.java | 2 +-
.../integration/producer/AtmosProducerDelTest.java | 2 +-
.../producer/AtmosProducerGetFolderTest.java | 2 +-
.../producer/AtmosProducerGetSingleTest.java | 2 +-
.../producer/AtmosProducerMoveTest.java | 2 +-
.../AtmosProducerPutFolderWithRemotePathTest.java | 2 +-
.../producer/AtmosProducerPutSingleFileTest.java | 2 +-
...mosProducerPutSingleFileWithRemotePathTest.java | 2 +-
.../atom/AtomPollingConsumerIdleMessageTest.java | 2 +-
.../component/atom/AtomPollingUnthrottledTest.java | 2 +-
.../apache/camel/component/atom/AtomRouteTest.java | 2 +-
.../MessageWithAttachmentRedeliveryIssueTest.java | 3 +-
.../org/apache/camel/attachment/WireTapTest.java | 3 +-
.../SecretsManagerNoEnvPropertiesSourceTestIT.java | 41 ++++----
.../SecretsManagerPropertiesSourceTestIT.java | 43 +++++----
.../aws/xray/CamelAwsXRayTestSupport.java | 4 +-
.../component/aws2/athena/AthenaComponentTest.java | 12 +--
.../camel/component/aws2/cw/CwComponentTest.java | 2 +-
.../aws2/cw/integration/CwComponentIT.java | 2 +-
.../component/aws2/ec2/EC2ComponentSpringTest.java | 3 +-
.../camel/component/aws2/ec2/EC2ProducerTest.java | 2 +-
.../component/aws2/ecs/ECS2ProducerSpringTest.java | 10 +-
.../camel/component/aws2/ecs/ECS2ProducerTest.java | 10 +-
.../component/aws2/eks/EKS2ProducerSpringTest.java | 10 +-
.../camel/component/aws2/eks/EKS2ProducerTest.java | 10 +-
.../integration/EventbridgePutRuleManualIT.java | 2 +-
.../integration/EventbridgePutRuleSqsManualIT.java | 2 +-
.../localstack/EventbridgeDeleteRuleIT.java | 2 +-
.../localstack/EventbridgeDescribeRuleIT.java | 2 +-
.../localstack/EventbridgeDisableRuleIT.java | 2 +-
.../localstack/EventbridgeEnableRuleIT.java | 2 +-
.../EventbridgeListRuleNamesByTargetIT.java | 2 +-
.../localstack/EventbridgeListRulesIT.java | 2 +-
.../localstack/EventbridgeListTargetsByRuleIT.java | 2 +-
.../localstack/EventbridgePutEventsIT.java | 2 +-
.../localstack/EventbridgePutRuleIT.java | 2 +-
.../localstack/EventbridgeRemoveTargetsIT.java | 2 +-
.../component/aws2/iam/IAMProducerSpringTest.java | 28 +++---
.../camel/component/aws2/iam/IAMProducerTest.java | 28 +++---
.../aws2/iam/integration/IAMCreateUserIT.java | 2 +-
.../aws2/iam/integration/IAMCreateUserPojoIT.java | 2 +-
.../aws2/iam/integration/IAMDeleteUserIT.java | 2 +-
.../aws2/iam/integration/IAMGetUserIT.java | 2 +-
.../aws2/iam/integration/IAMListAccessKeyIT.java | 2 +-
.../aws2/iam/integration/IAMListUserIT.java | 2 +-
.../component/aws2/kms/KMSProducerSpringTest.java | 14 +--
.../camel/component/aws2/kms/KMSProducerTest.java | 14 +--
.../aws2/kms/localstack/KmsCreateKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsDescribeKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsDisableKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsEnableKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsListKeysIT.java | 2 +-
.../kms/localstack/KmsScheduleDeleteKeyIT.java | 2 +-
.../aws2/lambda/LambdaComponentSpringTest.java | 25 ++---
.../lambda/LambdaProducerDefaultFunctionTest.java | 2 +-
.../component/aws2/lambda/LambdaProducerTest.java | 24 ++---
.../lambda/integration/LambdaCreateFunctionIT.java | 2 +-
.../lambda/integration/LambdaDeleteFunctionIT.java | 2 +-
.../lambda/integration/LambdaGetFunctionIT.java | 2 +-
.../lambda/integration/LambdaListFunctionsIT.java | 2 +-
.../lambda/integration/LambdaPublishVersionIT.java | 2 +-
.../component/aws2/mq/MQProducerSpringTest.java | 14 +--
.../camel/component/aws2/mq/MQProducerTest.java | 14 +--
.../component/aws2/msk/MSKProducerSpringTest.java | 10 +-
.../camel/component/aws2/msk/MSKProducerTest.java | 10 +-
.../aws2/s3/integration/S3ComponentManualIT.java | 4 +-
.../aws2/s3/integration/S3ConsumerIT.java | 2 +-
.../s3/integration/S3ConsumerIgnoreBodyIT.java | 2 +-
.../s3/integration/S3ConsumerIncludeBodyIT.java | 2 +-
.../aws2/s3/integration/S3ConsumerManualIT.java | 2 +-
.../s3/integration/S3CopyObjectCustomerKeyIT.java | 2 +-
.../integration/S3CopyObjectOperationManualIT.java | 2 +-
.../S3CreateDownloadLinkOperationIT.java | 2 +-
...wnloadLinkWithProvidedPresignerOperationIT.java | 2 +-
.../s3/integration/S3DeleteBucketOperationIT.java | 2 +-
.../s3/integration/S3ListObjectsOperationIT.java | 2 +-
.../integration/S3MultipartUploadOperationIT.java | 2 +-
.../S3ObjectRangeOperationManualIT.java | 2 +-
.../S3SimpleEncryptedUploadOperationIT.java | 2 +-
.../s3/integration/S3SimpleUploadOperationIT.java | 2 +-
.../s3/integration/S3StreamUploadOperationIT.java | 2 +-
.../s3/integration/S3StreamUploadTimeoutIT.java | 2 +-
.../SqsBatchConsumerConcurrentConsumersTest.java | 2 +-
.../component/aws2/sqs/SqsBatchConsumerTest.java | 2 +-
.../component/aws2/sqs/SqsComponentSpringTest.java | 8 +-
.../camel/component/aws2/sqs/SqsComponentTest.java | 4 +-
.../aws2/sqs/SqsConsumerIdleMessageTest.java | 2 +-
.../sqs/SqsDoesNotExtendMessageVisibilityTest.java | 3 +-
.../component/aws2/sqs/SqsProducerBatchTest.java | 2 +-
.../aws2/sqs/SqsProducerDeleteQueueTest.java | 2 +-
.../component/aws2/sqs/SqsProducerDeleteTest.java | 2 +-
.../aws2/sqs/SqsProducerListQueuesTest.java | 2 +-
.../component/aws2/sqs/SqsProducerPurgeTest.java | 2 +-
.../sqs/integration/SqsComponentLocalstackIT.java | 4 +-
.../SqsConsumerMessageLocalstackIT.java | 2 +-
...qsDeadletterWithClientRegistryLocalstackIT.java | 2 +-
.../SqsProducerAutoCreateQueueLocalstackIT.java | 2 +-
.../SqsProducerBatchSendFifoLocalstackIT.java | 2 +-
.../SqsProducerBatchSendLocalstackIT.java | 2 +-
...ProducerBatchSendWithSeparatorLocalstackIT.java | 2 +-
.../SqsProducerDeleteMessageLocalstackIT.java | 2 +-
.../SqsProducerSendByteArrayLocalstackIT.java | 2 +-
.../SqsProducerSendLocalstackMaxAttributesIT.java | 2 +-
.../component/aws2/sts/STS2ProducerSpringTest.java | 6 +-
.../camel/component/aws2/sts/STS2ProducerTest.java | 6 +-
.../aws2/sts/integration/StsAssumeRoleIT.java | 2 +-
.../sts/integration/StsGetFederationTokenIT.java | 2 +-
.../aws2/sts/integration/StsGetSessionTokenIT.java | 2 +-
.../translate/Translate2ProducerSpringTest.java | 6 +-
.../aws2/translate/Translate2ProducerTest.java | 6 +-
.../integration/Translate2ProducerManualIT.java | 6 +-
.../operations/KeyVaultOperationsTest.java | 2 +-
.../KeyVaultPropertiesSourceNoEnvTestIT.java | 11 ++-
.../operations/KeyVaultPropertiesSourceTestIT.java | 23 ++---
.../barcode/BarcodeDataFormatCamelTest.java | 11 ++-
.../base64/Base64DataFormatTestBase.java | 4 +-
.../base64/Base64PropertiesFunctionTest.java | 3 +-
.../base64/SpringBase64DataFormatTestBase.java | 4 +-
.../HibernateValidationProviderResolverTest.java | 2 +-
.../classtype/BindyCsvClassTypeAsStringTest.java | 5 +-
.../bindy/classtype/BindyCsvClassTypeTest.java | 5 +-
.../csv/BindyCarQuoteAndCommaDelimiterTest.java | 4 +-
.../bindy/csv/BindyComplexRegexSeparatorTest.java | 2 +-
.../csv/BindyMarshalEndWithLineBreakTest.java | 4 +-
.../bindy/csv/BindyPatternLocaleTest.java | 6 +-
.../bindy/csv/BindyPipeDelimiterTest.java | 6 +-
.../bindy/csv/BindySimpleCsvAutospanLineTest.java | 4 +-
...CsvContainingMultiQuoteCharEscapeFalseTest.java | 4 +-
...eCsvContainingMultiQuoteCharEscapeTrueTest.java | 4 +-
.../BindySimpleCsvFunctionWithClassMethodTest.java | 2 +-
...ndySimpleCsvFunctionWithExternalMethodTest.java | 2 +-
.../csv/BindySimpleCsvRegexAutospanLineTest.java | 4 +-
.../bindy/csv/BindyTabSeparatorTest.java | 8 +-
.../bindy/csv/WickedHeaderWithCommaCsvTest.java | 4 +-
.../BindyMarshalUnmarshalWithDefaultValueTest.java | 2 +-
.../bindy/csv2/BindyMarshalUnmarshalssueTest.java | 2 +-
.../bindy/csv2/BindyMarshalWithQuoteTest.java | 2 +-
.../bindy/csv2/BindyUnmarshalCommaIssueTest.java | 8 +-
...mpleFixedLengthMarshallWithClipAndTrimTest.java | 3 +-
...BindySimpleFixedLengthMarshallWithClipTest.java | 3 +-
.../CaffeineCacheFromScratchProducerTest.java | 2 +-
.../cache/CaffeineCacheProducerCacheNameTest.java | 2 +-
...neCacheProducerMultiOperationSameCacheTest.java | 2 +-
.../caffeine/cache/CaffeineCacheProducerTest.java | 16 ++--
.../CaffeineCacheRemovalListenerProducerTest.java | 12 +--
.../cache/CaffeineSendDynamicAwareOffTest.java | 2 +-
.../cache/CaffeineSendDynamicAwareTest.java | 2 +-
...adCacheProducerMultiOperationSameCacheTest.java | 2 +-
.../loadcache/CaffeineLoadCacheProducerTest.java | 16 ++--
.../CaffeineIdempotentRepositoryTest.java | 2 +-
.../integration/CassandraComponentConsumerIT.java | 6 +-
.../CassandraComponentResumeStrategyIT.java | 2 +-
.../cbor/CBORMarshalAllowJMSTypeTest.java | 2 +-
.../component/cbor/CBORObjectListSplitTest.java | 3 +-
.../camel/component/ChatScriptComponentIT.java | 2 +-
.../component/chunk/ChunkComponentLayersTest.java | 2 +-
.../chunk/ChunkComponentNestedLayersTest.java | 2 +-
.../component/chunk/ChunkComponentNestedTest.java | 2 +-
.../chunk/ChunkComponentTemplateTest.java | 2 +-
.../camel/component/chunk/ChunkComponentTest.java | 6 +-
.../ChunkDifferentThemeFolderAndSubfolderTest.java | 2 +-
...ferentThemeFolderSubfolderAndExtensionTest.java | 2 +-
...kDifferentThemeFolderSubfolderAndLayerTest.java | 2 +-
.../chunk/ChunkDifferentThemeFolderTest.java | 2 +-
.../camel/coap/CoAPComponentTLSTestBase.java | 28 +++---
.../org/apache/camel/coap/CoAPComponentTest.java | 4 +-
.../java/org/apache/camel/coap/CoAPPingTest.java | 2 +-
.../camel/coap/CoAPRestComponentTestBase.java | 4 +-
.../org/apache/camel/coap/CoAPRestVerbTest.java | 6 +-
.../cometd/MultipCometdProducerConsumerTest.java | 3 +-
.../cloud/ConsulDefaultServiceCallRouteIT.java | 3 +-
.../cloud/SpringConsulServiceCallRouteTest.java | 3 +-
.../integration/ConsumeMessagesWithLimitIT.java | 2 +-
.../integration/ConsumeResumeStrategyIT.java | 2 +-
.../integration/ProduceMessagesSimpleIT.java | 2 +-
.../integration/ProduceMessagesWithAutoIDIT.java | 2 +-
.../couchbase/integration/RemoveMessagesIT.java | 2 +-
.../camel/component/crypto/ECDSASignatureTest.java | 4 +-
.../camel/component/crypto/SignatureTest.java | 34 +++----
.../converter/crypto/CryptoDataFormatTest.java | 2 +-
.../camel/converter/crypto/PGPDataFormatTest.java | 24 ++---
.../language/csimple/joor/CSimpleBeanTest.java | 3 +-
.../csimple/joor/CSimpleDecHeaderTest.java | 2 +-
.../csimple/joor/CSimpleIncHeaderTest.java | 2 +-
.../joor/CSimpleSetHeaderPredicateTest.java | 7 +-
.../camel/language/csimple/joor/CSimpleTest.java | 3 +-
.../csv/CsvMarshalPipeDelimiterSpringTest.java | 2 +-
.../csv/CsvMarshalPipeDelimiterTest.java | 2 +-
.../csv/CsvUnmarshalCommentMarkerSpringTest.java | 2 +-
.../csv/CsvUnmarshalMapLineSpringTest.java | 8 +-
.../csv/CsvUnmarshalPipeDelimiterSpringTest.java | 2 +-
.../csv/CsvUnmarshalPipeDelimiterTest.java | 4 +-
.../csv/CsvUnmarshalSkipFirstLineSpringTest.java | 6 +-
.../csv/CsvUnmarshalStreamSpringTest.java | 2 +-
.../dataformat/csv/CsvUnmarshalStreamTest.java | 4 +-
.../csv/CsvUnmarshalTabDelimiterSpringTest.java | 4 +-
.../csv/CsvUnmarshalTabDelimiterTest.java | 4 +-
...CsvUnmarshalTwoCsvDataFormatConcurrentTest.java | 4 +-
.../jaxrs/CxfRsProducerEndpointConfigurerTest.java | 5 +-
.../cxf/jaxws/CxfMultipleConsumersSupportTest.java | 3 +-
.../CxfPayLoadSoapHeaderViaCamelHeaderTest.java | 2 +-
.../cxf/jaxws/CxfProducerSessionTest.java | 7 +-
.../cxf/jaxws/CxfProducerSynchronousFalseTest.java | 3 +-
.../cxf/jaxws/CxfProducerSynchronousTest.java | 3 +-
.../cxf/jaxws/CxfRawMessageRouterTest.java | 2 +-
.../component/cxf/util/SplitterWithXqureyTest.java | 4 +-
.../camel/component/cxf/CxfOneWayRouteTest.java | 2 +-
.../cxf/spring/FileToCxfMessageDataFormatTest.java | 2 +-
.../component/cxf/transport/CamelConduitTest.java | 4 +-
.../digitalocean/DigitalOceanComponentTest.java | 2 +-
.../integration/DigitalOceanComponentIT.java | 28 +++---
.../DirectRequestReplyAndDisruptorInOnlyTest.java | 3 +-
.../disruptor/DisruptorAsyncRouteTest.java | 2 +-
.../disruptor/DisruptorBlockWhenFullTest.java | 3 +-
.../disruptor/DisruptorBufferingTest.java | 2 +-
.../disruptor/DisruptorComplexInOutTest.java | 3 +-
.../DisruptorConcurrentConsumersNPEIssueTest.java | 4 +-
.../DisruptorConcurrentConsumersTest.java | 2 +-
.../disruptor/DisruptorConcurrentTest.java | 8 +-
.../DisruptorConsumerSuspendResumeTest.java | 4 +-
.../disruptor/DisruptorFromRouteIdTest.java | 2 +-
.../disruptor/DisruptorInOnlyChainedTest.java | 3 +-
.../component/disruptor/DisruptorInOnlyTest.java | 3 +-
.../disruptor/DisruptorInOutBigChainedTest.java | 3 +-
.../disruptor/DisruptorInOutChainedTest.java | 3 +-
.../DisruptorInOutChainedWithOnCompletionTest.java | 3 +-
.../component/disruptor/DisruptorInOutTest.java | 3 +-
...sruptorInOutWithErrorDeadLetterChannelTest.java | 3 +-
.../disruptor/DisruptorInOutWithErrorTest.java | 3 +-
.../disruptor/DisruptorMultipleConsumersTest.java | 13 +--
...sruptorReconfigureWithBlockingProducerTest.java | 3 +-
.../DisruptorShouldNotUseSameThreadTest.java | 2 +-
.../component/disruptor/DisruptorTimeoutTest.java | 4 +-
.../disruptor/DisruptorUnitOfWorkTest.java | 2 +-
.../DisruptorWaitForTaskAsPropertyTest.java | 5 +-
...sruptorWaitForTaskCompleteOnCompletionTest.java | 3 +-
.../DisruptorWaitForTaskCompleteTest.java | 5 +-
.../DisruptorWaitForTaskIfReplyExpectedTest.java | 5 +-
.../DisruptorWaitForTaskNeverOnCompletionTest.java | 3 +-
.../disruptor/DisruptorWaitForTaskNeverTest.java | 5 +-
.../FileDisruptorShutdownCompleteAllTasksTest.java | 2 +-
.../vm/DisruptorVmConcurrentConsumersTest.java | 2 +-
...mDifferentOptionsOnConsumerAndProducerTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOnlyChainedTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOnlyTest.java | 3 +-
.../disruptor/vm/DisruptorVmInOutChainedTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOutTest.java | 3 +-
.../vm/DisruptorVmInOutWithErrorTest.java | 3 +-
.../vm/DisruptorVmMultipleConsumersIssueTest.java | 3 +-
.../vm/DisruptorVmShouldNotUseSameThreadTest.java | 2 +-
.../disruptor/vm/DisruptorVmSplitterTest.java | 2 +-
.../disruptor/vm/DisruptorVmUseSameQueueTest.java | 3 +-
.../vm/DisruptorVmWaitForTaskCompleteTest.java | 5 +-
.../DisruptorVmWaitForTaskIfReplyExpectedTest.java | 5 +-
.../vm/DisruptorVmWaitForTaskNewerTest.java | 5 +-
.../it/DockerCustomCmdExecFactoryTestIT.java | 2 +-
.../docker/it/DockerNettyCmdExecFactoryTest.java | 2 +-
.../component/docker/it/DockerProducerTest.java | 2 +-
.../docker/it/DockerStatsConsumerTest.java | 2 +-
.../converter/dozer/DozerTypeConverterDTOTest.java | 2 +-
.../converter/dozer/DozerTypeConverterTest.java | 2 +-
.../SpringDozerTypeConverterConfigurationTest.java | 2 +-
.../dozer/SpringDozerTypeConverterTest.java | 2 +-
.../SpringDozerTypeConverterWithMapIdTest.java | 2 +-
.../apache/camel/component/drill/ProducerTest.java | 2 +-
.../integration/producer/DropboxProducerDelIT.java | 2 +-
.../producer/DropboxProducerMoveIT.java | 2 +-
.../producer/DropboxProducerPutSingleFileIT.java | 2 +-
.../component/ehcache/EhcacheConsumerTest.java | 2 +-
.../component/ehcache/EhcacheProducerTest.java | 20 ++--
.../EhcacheIdempotentRepositoryTest.java | 2 +-
.../component/etcd3/AggregateEtcd3ManualTest.java | 2 +-
.../component/etcd3/policy/Etcd3RoutePolicyIT.java | 4 +-
.../facebook/FacebookComponentConsumerIT.java | 2 +-
.../facebook/FacebookComponentProducerIT.java | 2 +-
.../file/watch/FileWatchComponentTest.java | 2 +-
.../flatpack/FlatpackDelimitedDataFormatTest.java | 6 +-
.../FlatpackFixedLengthDataFormatTest.java | 4 +-
...edLengthWithHeaderAndTrailerDataFormatTest.java | 2 +-
.../freemarker/FreemarkerConcurrentTest.java | 3 +-
.../FileToFtpsExplicitSSLWithClientAuthIT.java | 2 +-
.../FileToFtpsExplicitSSLWithoutClientAuthIT.java | 2 +-
.../FileToFtpsExplicitTLSWithClientAuthIT.java | 2 +-
.../FileToFtpsExplicitTLSWithoutClientAuthIT.java | 2 +-
.../FileToFtpsImplicitSSLWithClientAuthIT.java | 2 +-
.../FileToFtpsImplicitSSLWithoutClientAuthIT.java | 2 +-
.../FileToFtpsImplicitTLSWithClientAuthIT.java | 2 +-
.../FileToFtpsImplicitTLSWithoutClientAuthIT.java | 2 +-
...FtpsWithCustomKeyAndTrustStorePropertiesIT.java | 2 +-
...FileToFtpsWithCustomTrustStorePropertiesIT.java | 2 +-
.../FileToFtpsWithDefaultSettingsIPV6IT.java | 2 +-
.../FileToFtpsWithDefaultSettingsIT.java | 2 +-
.../FileToFtpsWithFtpClientConfigRefIT.java | 2 +-
.../integration/FromFilePasswordBeanRefIT.java | 2 +-
.../integration/FromFilePasswordPropertyRefIT.java | 2 +-
.../FromFilePercentSignInPasswordIT.java | 2 +-
.../FromFileToFtpDefaultRootRenameStrategyIT.java | 2 +-
.../remote/integration/FromFileToFtpDeleteIT.java | 2 +-
.../file/remote/integration/FromFileToFtpIT.java | 2 +-
.../integration/FromFileToFtpSplitParallelIT.java | 2 +-
.../integration/FromFileToFtpWithChmodIT.java | 2 +-
.../FromFileTransferLoggingLevelIT.java | 2 +-
.../FromFileTransferLoggingLevelVerboseIT.java | 2 +-
.../remote/integration/FromFtpAsyncProcessIT.java | 3 +-
.../integration/FromFtpKeepLastModifiedIT.java | 6 +-
.../remote/integration/FromFtpRecursiveNoopIT.java | 4 +-
.../FromFtpRecursiveNotStepwiseNoBasePathIT.java | 2 +-
.../FromFtpRemoteFileSortByExpressionIT.java | 4 +-
...mFtpRemoteFileSortByIgnoreCaseExpressionIT.java | 6 +-
.../FromFtpRemoteFileSortByNestedExpressionIT.java | 4 +-
.../FromFtpSetNamesWithMultiDirectoriesIT.java | 2 +-
.../remote/integration/FromFtpThirdPoolOkIT.java | 3 +-
.../FromQueueThenConsumeFtpToMockIT.java | 2 +-
.../remote/integration/FtpChangedReadLockIT.java | 2 +-
.../integration/FtpChangedRootDirReadLockIT.java | 2 +-
.../FtpChangedZeroLengthReadLockIT.java | 2 +-
.../integration/FtpConsumerAbsolutePathIT.java | 2 +-
.../integration/FtpConsumerAsyncStressIT.java | 2 +-
.../integration/FtpConsumerBodyAsStringIT.java | 2 +-
.../integration/FtpConsumerDisconnectIT.java | 3 +-
.../FtpConsumerDoneFileNameFixedIT.java | 7 +-
.../integration/FtpConsumerDoneFileNameIT.java | 7 +-
.../integration/FtpConsumerDualDoneFileNameIT.java | 5 +-
.../integration/FtpConsumerIPV6BodyAsStringIT.java | 2 +-
.../integration/FtpConsumerIdempotentIT.java | 4 +-
.../FtpConsumerIdempotentKeyChangedIssueIT.java | 7 +-
.../FtpConsumerIdempotentMemoryRefIT.java | 7 +-
.../integration/FtpConsumerIdempotentRefIT.java | 4 +-
...ConsumerLocalWorkDirectoryAsAbsolutePathIT.java | 2 +-
.../FtpConsumerLocalWorkDirectoryIT.java | 4 +-
.../FtpConsumerMaxMessagesPerPollIT.java | 4 +-
.../integration/FtpConsumerMoveExpressionIT.java | 2 +-
.../FtpConsumerMultipleDirectoriesIT.java | 2 +-
.../FtpConsumerNotEagerMaxMessagesPerPollIT.java | 4 +-
.../FtpConsumerPostProcessingOnDisconnectIT.java | 4 +-
.../integration/FtpConsumerRelativeFileNameIT.java | 2 +-
.../integration/FtpConsumerReplyStringIT.java | 2 +-
.../integration/FtpConsumerResumeDownloadIT.java | 2 +-
.../FtpConsumerThrowExceptionOnLoginFailedIT.java | 3 +-
.../FtpConsumerUsingFTPClientConfigIT.java | 2 +-
.../integration/FtpConsumerWithCharsetIT.java | 2 +-
.../integration/FtpConsumerWithNoFileOptionIT.java | 2 +-
.../FtpNoReconnectAttemptUnknownHostIT.java | 2 +-
.../FtpPollEnrichBridgeErrorHandlerIT.java | 3 +-
...PollEnrichConsumeWithDisconnectAndDeleteIT.java | 2 +-
.../FtpPollingConsumerIdleMessageIT.java | 2 +-
...FtpProducerAllowNullBodyFileAlreadyExistIT.java | 4 +-
.../integration/FtpProducerConcurrentIT.java | 3 +-
.../FtpProducerConnectErrorsHeaderIT.java | 2 +-
.../integration/FtpProducerFileExistAppendIT.java | 2 +-
.../FtpProducerFileExistAppendNoFileBeforeIT.java | 2 +-
.../integration/FtpProducerFileExistFailIT.java | 2 +-
.../integration/FtpProducerFileExistIgnoreIT.java | 2 +-
.../FtpProducerFileExistOverrideIT.java | 2 +-
...FtpProducerFileExistOverrideNoFileBeforeIT.java | 2 +-
.../FtpProducerJailStartingDirectoryIT.java | 4 +-
...oducerRecipientListParallelTimeoutManualIT.java | 2 +-
.../integration/FtpProducerReplyStringIT.java | 2 +-
.../integration/FtpProducerToDMoveExistingIT.java | 3 +-
.../FtpReconnectAttemptServerStoppedIT.java | 4 +-
.../FtpReconnectAttemptUnknownHostIT.java | 2 +-
.../remote/integration/FtpRecursiveDepth2IT.java | 2 +-
.../remote/integration/FtpRecursiveDepth3IT.java | 2 +-
.../remote/integration/FtpRecursiveDepthIT.java | 2 +-
.../integration/FtpShutdownCompleteAllTasksIT.java | 2 +-
.../FtpShutdownCompleteCurrentTaskOnlyIT.java | 2 +-
.../integration/FtpSimpleConsumeAbsoluteIT.java | 2 +-
...irectoryParseWithAbsoluteDepthNoStepwiseIT.java | 2 +-
.../FtpSimpleConsumeStreamingPartialReadIT.java | 2 +-
.../FtpSimpleConsumeStreamingStepwiseFalseIT.java | 2 +-
...pSimpleConsumeStreamingWithMultipleFilesIT.java | 2 +-
.../remote/integration/FtpStreamingMoveIT.java | 2 +-
.../file/remote/integration/PaddyRouteIT.java | 2 +-
.../RecipientListErrorHandlingIssueIT.java | 5 +-
.../RemoteFileProduceOverruleOnlyOnceIT.java | 2 +-
.../SftpConsumerLocalWorkDirectoryIT.java | 4 +-
...PollEnrichConsumeWithDisconnectAndDeleteIT.java | 2 +-
.../remote/manual/FtpConsumerCamelManualTest.java | 3 +-
.../FtpConsumerCamelRecursiveManualTest.java | 3 +-
...ConsumerCamelRecursiveToAbsoluteManualTest.java | 3 +-
.../FtpConsumerNotStepwiseCamelManualTest.java | 3 +-
...onsumerNotStepwiseCamelRecursiveManualTest.java | 3 +-
...StepwiseCamelRecursiveToAbsoluteManualTest.java | 3 +-
.../remote/manual/FtpConsumerScottManualTest.java | 3 +-
.../FtpConsumerScottRecursiveManualTest.java | 3 +-
.../FromSftpRecursiveNotStepwiseNoBasePathIT.java | 2 +-
.../sftp/integration/SftpChangedReadLockIT.java | 2 +-
.../sftp/integration/SftpConsumerDisconnectIT.java | 4 +-
.../integration/SftpConsumerWithCharsetIT.java | 2 +-
.../sftp/integration/SftpECKeyFileConsumeIT.java | 2 +-
.../integration/SftpEDDSAKeyFileConsumeIT.java | 2 +-
.../remote/sftp/integration/SftpKeyConsumeIT.java | 2 +-
.../sftp/integration/SftpKeyFileConsumeIT.java | 2 +-
.../sftp/integration/SftpKeyPairECConsumeIT.java | 2 +-
.../sftp/integration/SftpKeyPairRSAConsumeIT.java | 2 +-
.../SftpKeyUriConsumeFromClasspathIT.java | 2 +-
.../sftp/integration/SftpKeyUriConsumeIT.java | 2 +-
.../sftp/integration/SftpSimpleConsumeIT.java | 2 +-
.../SftpSimpleConsumeNoStartingDirIT.java | 2 +-
.../integration/SftpSimpleConsumeRecursiveIT.java | 2 +-
.../integration/SftpSimpleConsumeStreamingIT.java | 2 +-
.../SftpSimpleConsumeStreamingPartialReadIT.java | 2 +-
...pSimpleConsumeStreamingWithMultipleFilesIT.java | 2 +-
.../SftpSimpleConsumeThroughProxyIT.java | 2 +-
.../sftp/integration/SftpSimpleIPV6ConsumeIT.java | 2 +-
.../sftp/integration/SftpUseListFalseIT.java | 2 +-
.../geocoder/GeoCoderComponentAddressTest.java | 2 +-
.../geocoder/GeoCoderCurrentAddressTest.java | 2 +-
.../geocoder/GeoCoderEmptyAddressTest.java | 2 +-
.../geocoder/GeoCoderLatLngComponentTest.java | 2 +-
.../geocoder/GeoCoderNominatimAddressTest.java | 2 +-
.../component/geocoder/GeoCoderNominatimTest.java | 2 +-
...oogleCalendarStreamConsumerIntegrationTest.java | 2 +-
.../component/google/drive/FileConverterIT.java | 2 +-
.../component/google/drive/FilesConsumerIT.java | 2 +-
.../drive/GoogleDriveFilesConverterTest.java | 2 +-
.../functions/integration/GoogleCloudIT.java | 2 +-
.../google/mail/GmailUsersMessagesConsumerIT.java | 2 +-
.../GoogleMailStreamConsumerIntegrationTest.java | 2 +-
...leSecretManagerPropertiesNoEnvSourceTestIT.java | 29 +++---
.../GoogleSecretManagerPropertiesSourceTestIT.java | 31 +++---
.../SheetsStreamConsumerIntegrationTest.java | 4 +-
.../google/storage/integration/ComplexIT.java | 2 +-
.../storage/unit/ConsumerDownloadLocalTest.java | 2 +-
.../google/storage/unit/ConsumerLocalTest.java | 2 +-
.../storage/unit/ConsumerWithFilterOptionTest.java | 4 +-
.../google/storage/unit/ProducerLocalTest.java | 2 +-
.../language/groovy/GroovyInvokeMethodTest.java | 2 +-
.../camel/language/groovy/GroovyListMapTest.java | 2 +-
.../camel/language/groovy/GroovyResourceTest.java | 3 +-
.../language/groovy/GroovySetFixedHeaderTest.java | 2 +-
.../camel/language/groovy/GroovySetHeaderTest.java | 2 +-
.../language/groovy/LanguageGroovyRouteTest.java | 3 +-
.../camel/processor/groovy/GroovyFilterTest.java | 5 +-
.../groovy/GroovySetHeaderConcurrentIssueTest.java | 3 +-
.../processor/groovy/GroovySetHeaderIssueTest.java | 3 +-
.../processor/groovy/GroovySumFilterTest.java | 5 +-
.../processor/groovy/InlinedGroovyScriptTest.java | 3 +-
.../camel/component/gson/GsonConcurrentTest.java | 3 +-
.../guava/eventbus/GuavaEventBusComponentTest.java | 3 +-
.../guava/eventbus/GuavaEventBusConsumerTest.java | 11 ++-
.../GuavaEventBusConsumingDeadEventsTest.java | 5 +-
.../HashicorpVaultPropertiesSourceNoEnvTestIT.java | 43 +++++----
.../HashicorpVaultPropertiesSourceTestIT.java | 43 +++++----
...ashicorpProducerCreateMultiVersionSecretIT.java | 2 +-
.../HashicorpProducerCreateSecretIT.java | 2 +-
.../HashicorpProducerCreateSecretPOJOIT.java | 2 +-
.../HashicorpProducerDeleteSecretIT.java | 2 +-
.../operations/HashicorpProducerListSecretsIT.java | 2 +-
...ashicorpProducerReadMultiVersionedSecretIT.java | 2 +-
.../hazelcast/HazelcastInstanceConsumerTest.java | 4 +-
.../hazelcast/HazelcastListConsumerTest.java | 4 +-
.../hazelcast/HazelcastMapConsumerTest.java | 10 +-
.../hazelcast/HazelcastMultimapConsumerTest.java | 6 +-
.../hazelcast/HazelcastQueueConsumerPollTest.java | 4 +-
.../hazelcast/HazelcastQueueConsumerTest.java | 4 +-
.../HazelcastReliableTopicConsumerTest.java | 2 +-
.../HazelcastReplicatedmapConsumerTest.java | 6 +-
.../HazelcastSedaConcurrentConsumersTest.java | 2 +-
.../component/hazelcast/HazelcastSedaFIFOTest.java | 2 +-
.../hazelcast/HazelcastSedaInOnlyTest.java | 2 +-
.../hazelcast/HazelcastSedaInOutTest.java | 2 +-
.../HazelcastSedaRecoverableConsumerTest.java | 2 +-
.../hazelcast/HazelcastSedaSpringSupportTest.java | 2 +-
.../HazelcastSedaTransferExchangeTest.java | 4 +-
.../hazelcast/HazelcastSetConsumerTest.java | 4 +-
.../hazelcast/HazelcastTopicConsumerTest.java | 2 +-
.../HazelcastIdempotentRepositoryTest.java | 2 +-
.../idempotent/HBaseIdempotentRepositoryIT.java | 2 +-
.../headersmap/CamelFastHeadersMapTest.java | 2 +-
.../camel/component/hl7/HL7ByteArrayRouteTest.java | 6 +-
.../camel/component/hl7/HL7DataFormatTest.java | 14 +--
.../component/hl7/HL7MLLPCodecPlainStringTest.java | 2 +-
.../hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 6 +-
.../component/hl7/HL7MLLPNettyRouteToTest.java | 3 +-
.../camel/component/hl7/HL7NettyRouteTest.java | 6 +-
.../apache/camel/component/hl7/HL7RouteTest.java | 6 +-
.../camel/component/hl7/HL7ValidateTest.java | 10 +-
.../camel/component/hl7/HL7XmlDataFormatTest.java | 4 +-
.../camel/component/hl7/MessageValidatorTest.java | 14 +--
.../camel/component/hl7/TerserExpressionTest.java | 8 +-
.../component/http/HttpProducerSessionTest.java | 7 +-
.../camel/component/iec60870/ConnectionTest.java | 6 +-
.../ignite/IgniteCacheContinuousQueryTest.java | 19 ++--
.../camel/component/ignite/IgniteEventsTest.java | 7 +-
.../camel/component/iota/IOTAProducerTest.java | 6 +-
.../component/ironmq/FromQueueToQueueTest.java | 2 +-
.../component/ironmq/IronMQBatchConsumerTest.java | 2 +-
.../ironmq/IronMQBatchDeleteConsumerTest.java | 2 +-
.../component/ironmq/IronMQBatchProducerTest.java | 2 +-
.../ironmq/IronMQComponentSpringTest.java | 4 +-
.../component/ironmq/IronMQComponentTest.java | 6 +-
.../ironmq/IronMQPreserveHeadersTest.java | 2 +-
.../ConcurrentConsumerLoadManualTest.java | 2 +-
.../ironmq/integrationtest/FileCopyExample.java | 3 +-
.../integrationtest/IronMQComponentManualTest.java | 2 +-
.../ironmq/integrationtest/IronMQFIFOTest.java | 2 +-
.../IronMQRackspaceComponentManualTest.java | 2 +-
.../component/ironmq/integrationtest/LoadTest.java | 2 +-
.../Queue2QueueExampleManualTest.java | 3 +-
.../component/jackson/JacksonConcurrentTest.java | 3 +-
.../jackson/JacksonIncludeDefaultTest.java | 2 +-
.../jackson/JacksonIncludeNotNulllTest.java | 2 +-
.../jackson/JacksonMarshalAllowJMSTypeTest.java | 2 +-
.../jackson/JacksonMarshalUnmarshalArrayTest.java | 2 +-
.../jackson/JacksonMarshalUnmarshalListTest.java | 4 +-
.../JacksonMarshalUnmarshalPojoArrayTest.java | 2 +-
...onMarshalUnmarshalTypeHeaderNotAllowedTest.java | 2 +-
.../JacksonMarshalUnmarshalTypeHeaderTest.java | 2 +-
.../camel/component/jackson/JacksonModuleTest.java | 2 +-
.../jackson/JacksonObjectListSplitTest.java | 3 +-
.../SpringJacksonMarshalUnmarshalListTest.java | 4 +-
.../jacksonxml/JacksonConcurrentTest.java | 3 +-
.../jacksonxml/JacksonEmptyElementsAsNullTest.java | 4 +-
.../jacksonxml/JacksonIncludeDefaultTest.java | 2 +-
.../jacksonxml/JacksonIncludeNotNulllTest.java | 2 +-
.../jacksonxml/JacksonMarshalAllowJMSTypeTest.java | 2 +-
.../JacksonMarshalUnmarshalListTest.java | 4 +-
...onMarshalUnmarshalTypeHeaderNotAllowedTest.java | 2 +-
.../JacksonMarshalUnmarshalTypeHeaderTest.java | 2 +-
.../component/jacksonxml/JacksonModuleTest.java | 2 +-
.../jacksonxml/JacksonObjectListSplitTest.java | 3 +-
.../SpringJacksonMarshalUnmarshalListTest.java | 4 +-
.../component/jasypt/JasyptPropertiesTest.java | 3 +-
.../SpringJasyptBridgePropertiesAutowireTest.java | 3 +-
.../jasypt/SpringJasyptBridgePropertiesTest.java | 3 +-
.../jasypt/SpringJasyptProperties2Test.java | 3 +-
.../jasypt/SpringJasyptPropertiesTest.java | 3 +-
...ncurrentJaxbDataFormatSchemaValidationTest.java | 4 +-
.../jaxb/JaxbDataFormatMultipleNamespacesTest.java | 4 +-
.../jaxb/JaxbDataFormatPartClassHeaderTest.java | 2 +-
.../jaxb/JaxbDataFormatPartClassTest.java | 2 +-
.../JaxbDataFormatSchemaValidationSpringTest.java | 4 +-
.../jaxb/JaxbDataFormatSchemaValidationTest.java | 4 +-
.../camel/example/DataFormatConcurrentTest.java | 2 +-
.../camel/example/DataFormatDataSetTest.java | 3 +-
.../ExplicitEncodingAndXMLCharFilteringTest.java | 2 +-
.../camel/example/ExplicitFileEncodingTest.java | 2 +-
.../example/JaxbConcurrentDataFormatTest.java | 3 +-
.../org/apache/camel/example/JaxbErrorLogTest.java | 3 +-
.../camel/example/RouteWithErrorHandlerTest.java | 6 +-
.../camel/jaxb/DirectBeanToBeanPersonTypeTest.java | 3 +-
...lbackTypeConverterObjectFactoryEnabledTest.java | 3 +-
...lbackTypeConverterShouldThrowExceptionTest.java | 7 +-
.../apache/camel/jaxb/JaxbDataFormatIssueTest.java | 2 +-
.../jaxb/JaxbDataFormatMustBeJAXBElementTest.java | 4 +-
.../jaxb/JaxbMarshalNamespacePrefixMapperTest.java | 2 +-
.../jaxb/TimerBeanToBeanNotificationTypeTest.java | 3 +-
.../camel/component/jbpm/JBPMComponentIT.java | 9 +-
.../camel/component/jcache/JCacheConsumerTest.java | 2 +-
.../JcloudsFileConsumerStreamCachingIssueTest.java | 3 +-
.../camel/component/jcr/JcrGetNodeByIdTest.java | 2 +-
.../camel/component/jdbc/JdbcAnotherRouteTest.java | 2 +-
.../component/jdbc/JdbcDefaultDataSourceTest.java | 2 +-
.../camel/component/jdbc/JdbcFix18157Test.java | 2 +-
.../camel/component/jdbc/JdbcFix9491Test.java | 2 +-
.../camel/component/jdbc/JdbcOptionsTest.java | 2 +-
.../component/jdbc/JdbcParameterizedQueryTest.java | 6 +-
.../jdbc/JdbcProducerConcurrenctTest.java | 2 +-
...roducerOutputTypeSelectListOutputClassTest.java | 2 +-
.../jdbc/JdbcProducerOutputTypeSelectListTest.java | 2 +-
...ProducerOutputTypeSelectOneOutputClassTest.java | 2 +-
.../jdbc/JdbcProducerOutputTypeSelectOneTest.java | 2 +-
.../camel/component/jdbc/JdbcRouteSplitTest.java | 2 +-
.../component/jdbc/JdbcSpringAnotherRouteTest.java | 2 +-
.../component/jdbc/JdbcTransformSimpleTest.java | 2 +-
.../component/jetty/ExcludeCipherSuitesTest.java | 3 +-
.../jetty/HttpEmptyQueryParameterTest.java | 7 +-
.../jetty/HttpFilterNoCamelHeadersTest.java | 3 +-
.../jetty/HttpProducerConcurrentTest.java | 3 +-
.../component/jetty/HttpProducerSOTimeoutTest.java | 4 +-
.../jetty/HttpProducerSendEmptyHeaderTest.java | 2 +-
.../jetty/HttpProducerUnsafeCharsTest.java | 2 +-
.../camel/component/jetty/HttpSendFileTest.java | 2 +-
.../jetty/HttpStreamCacheFileIssueTest.java | 3 +-
.../jetty/HttpStreamCacheFileStopIssueTest.java | 3 +-
.../camel/component/jetty/HttpToFileTest.java | 2 +-
.../camel/component/jetty/InterfacesTest.java | 5 +-
.../jetty/JettyCallHttpThenExceptionTest.java | 3 +-
.../component/jetty/JettyCamelHttpUrlCBRTest.java | 3 +-
.../jetty/JettyContentBasedRouteTest.java | 4 +-
.../jetty/JettyContinuationDisabledTest.java | 3 +-
.../camel/component/jetty/JettyEnableJmxTest.java | 2 +-
.../JettyEndpointContinuationDisabledTest.java | 3 +-
.../camel/component/jetty/JettyHandle404Test.java | 2 +-
.../component/jetty/JettyHttpContentTypeTest.java | 5 +-
.../JettyHttpGetWithParamAsExchangeHeaderTest.java | 16 ++--
.../component/jetty/JettyHttpGetWithParamTest.java | 6 +-
.../component/jetty/JettyHttpHeadersTest.java | 3 +-
.../jetty/JettyHttpMapHttpMessageHeadersTest.java | 12 +--
.../jetty/JettyLongestContextPathMatchTest.java | 27 +++---
.../jetty/JettySimplifiedHandle404Test.java | 2 +-
.../component/jetty/JettySimulateInOnlyTest.java | 4 +-
.../camel/component/jetty/JettySteveIssueTest.java | 2 +-
.../component/jetty/JettyWithXPathChoiceTest.java | 4 +-
.../component/jetty/async/JettyAsyncCBRTest.java | 3 +-
.../async/JettyAsyncContinuationDisabledTest.java | 3 +-
.../async/JettyAsyncContinuationTimeoutOkTest.java | 3 +-
.../async/JettyAsyncContinuationTimeoutTest.java | 3 +-
.../JettyAsyncDefaultContinuationTimeoutTest.java | 3 +-
.../jetty/async/JettyAsyncFilterTest.java | 3 +-
.../component/jetty/async/JettyAsyncTest.java | 3 +-
.../jetty/async/JettyAsyncThrottleTest.java | 3 +-
.../jetty/async/JettyAsyncTransformTest.java | 3 +-
.../jetty/async/JettyAsyncTryCatchFinallyTest.java | 3 +-
.../jetty/file/JettyFileConsumerTest.java | 3 +-
.../camel/component/jetty/manual/JettyManual.java | 2 +-
.../jetty/rest/RestBridgeEndpointTest.java | 3 +-
.../jetty/rest/RestHttpsClientAuthRouteTest.java | 2 +-
.../rest/RestJettyBindingModeAutoWithJsonTest.java | 2 +-
.../rest/RestJettyBindingModeAutoWithXmlTest.java | 2 +-
.../jetty/rest/RestJettyBindingModeJsonTest.java | 4 +-
.../RestJettyBindingModeJsonWithContractTest.java | 2 +-
.../RestJettyBindingModeOffWithContractTest.java | 2 +-
.../jetty/rest/RestJettyBindingModeXmlTest.java | 4 +-
.../component/jetty/rest/RestJettyGetCorsTest.java | 7 +-
.../jetty/rest/RestJettyPostJsonJaxbPojoTest.java | 2 +-
.../RestJettyPostJsonPojoDisableFeatureTest.java | 2 +-
.../jetty/rest/RestJettyPostJsonPojoListTest.java | 2 +-
.../jetty/rest/RestJettyPostJsonPojoTest.java | 2 +-
.../jetty/rest/RestJettyPostXmlJaxbPojoTest.java | 4 +-
.../component/jetty/rest/RestJettyVerbTest.java | 6 +-
.../jetty/rest/RestNoBridgeEndpointTest.java | 3 +-
.../rest/producer/HttpRestProducerPutTest.java | 3 +-
.../rest/producer/JettyRestProducerPutTest.java | 3 +-
.../component/jgroups/JGroupsConsumerTest.java | 4 +-
.../jms/ActiveMQOriginalDestinationTest.java | 2 +-
.../component/jms/ConsumeMessageConverterTest.java | 4 +-
.../jms/FileRouteJmsKeepLastModifiedTest.java | 3 +-
.../component/jms/FileRouteJmsPreMoveTest.java | 3 +-
.../camel/component/jms/FileRouteToJmsTest.java | 2 +-
.../component/jms/FileRouteToJmsToFileTest.java | 2 +-
.../component/jms/FromTextToBytesMessageTest.java | 6 +-
.../jms/JmsAddAndRemoveRouteManagementTest.java | 3 +-
.../jms/JmsAllowAdditionalHeadersTest.java | 3 +-
.../camel/component/jms/JmsAllowNullBodyTest.java | 7 +-
.../camel/component/jms/JmsAutoStartupTest.java | 4 +-
.../jms/JmsBatchResequencerJMSPriorityTest.java | 2 +-
.../camel/component/jms/JmsClientAckTest.java | 2 +-
...sumerRestartPickupConfigurationChangesTest.java | 4 +-
.../jms/JmsCustomHeaderFilterStrategyTest.java | 2 +-
.../component/jms/JmsDeadLetterQueueTest.java | 4 +-
...msDeadLetterQueueUsingTransferExchangeTest.java | 4 +-
.../jms/JmsDefaultTaskExecutorTypeTest.java | 9 +-
.../component/jms/JmsDestinationResolverTest.java | 2 +-
.../camel/component/jms/JmsDurableTopicTest.java | 2 +-
.../jms/JmsEagerLoadingPropertiesTest.java | 2 +-
.../jms/JmsInOnlyDisableTimeToLiveTest.java | 13 +--
.../jms/JmsInOnlyIncludeSentJMSMessageIDTest.java | 2 +-
.../jms/JmsInOnlyInvalidDestinationTest.java | 3 +-
.../jms/JmsInOnlyWithReplyToAsHeaderTest.java | 3 +-
...ToDisabledButJMSReplyToHeaderPreservedTest.java | 3 +-
.../jms/JmsInOnlyWithReplyToDisabledTest.java | 3 +-
.../jms/JmsInOnlyWithReplyToHeaderTest.java | 2 +-
.../jms/JmsInOnlyWithReplyToHeaderTopicTest.java | 2 +-
.../jms/JmsInOnlyWithReplyToNotPreservedTest.java | 3 +-
.../component/jms/JmsInOnlyWithReplyToTest.java | 3 +-
.../jms/JmsInOutDisableTimeToLiveTest.java | 5 +-
.../jms/JmsInOutFixedReplyQueueTimeoutTest.java | 5 +-
.../jms/JmsInOutIndividualRequestTimeoutTest.java | 7 +-
.../component/jms/JmsInOutNonPersistentTest.java | 3 +-
.../jms/JmsInOutTransferExchangeTest.java | 2 +-
.../jms/JmsIncludeAllJMSXPropertiesTest.java | 3 +-
.../component/jms/JmsLoadBalanceFailoverTest.java | 3 +-
...ailoverWithForceSendOriginalJmsMessageTest.java | 4 +-
...geAsOriginalMessageInDefaultUnitOfWorkTest.java | 2 +-
.../component/jms/JmsMessageBodySetNullTest.java | 9 +-
.../JmsMessageCreatedStrategyComponentTest.java | 2 +-
.../jms/JmsMessageCreatedStrategyEndpointTest.java | 2 +-
.../jms/JmsMessageIDNotOverridenAMQTest.java | 2 +-
.../camel/component/jms/JmsMessageTypeTest.java | 22 ++---
.../component/jms/JmsMultipleConsumersTest.java | 5 +-
.../JmsNotInOnlyIncludeSentJMSMessageIDTest.java | 2 +-
.../jms/JmsNotIncludeAllJMSXPropertiesTest.java | 3 +-
...OnCompletionAndInterceptAndOnExceptionTest.java | 4 +-
.../camel/component/jms/JmsOnCompletionTest.java | 4 +-
.../component/jms/JmsPollingConsumerTest.java | 8 +-
.../component/jms/JmsProducerConcurrentTest.java | 3 +-
.../jms/JmsProducerConcurrentWithReplyTest.java | 3 +-
.../jms/JmsProducerWithJMSHeaderTest.java | 30 +++---
.../camel/component/jms/JmsRemoveHeaderTest.java | 2 +-
...lyProcessRepliesConcurrentUsingThreadsTest.java | 2 +-
...RequestReplyTempQueueMultipleConsumersTest.java | 4 +-
.../jms/JmsRouteDeliveryModePreserveQoSTest.java | 16 ++--
.../jms/JmsRouteUsingDifferentHeadersTest.java | 2 +-
.../component/jms/JmsRouteUsingJMSXGroupTest.java | 3 +-
.../JmsRouteWithCustomListenerContainerTest.java | 2 +-
.../JmsRouteWithDefaultKeyFormatStrategyTest.java | 6 +-
.../jms/JmsRouteWithInOnlyAndMultipleAcksTest.java | 2 +-
.../component/jms/JmsRouteWithInOnlyTest.java | 2 +-
.../component/jms/JmsRoutingSlipInOutTest.java | 3 +-
.../camel/component/jms/JmsRoutingSlipTest.java | 3 +-
.../camel/component/jms/JmsSelectorOptionTest.java | 2 +-
.../apache/camel/component/jms/JmsSessionTest.java | 2 +-
...BodyNullErrorHandlerUseOriginalMessageTest.java | 3 +-
.../camel/component/jms/JmsSimpleHeaderTest.java | 6 +-
.../jms/JmsSimpleRequestLateReplyTest.java | 3 +-
.../component/jms/JmsSimpleRequestReply2Test.java | 5 +-
.../JmsSimpleRequestReplyFixedReplyQueueTest.java | 5 +-
.../jms/JmsSplitterParallelChainedTest.java | 3 +-
.../component/jms/JmsSplitterParallelTest.java | 3 +-
.../jms/JmsSpringLoadBalanceFailoverTest.java | 3 +-
.../JmsStreamMessageTypeNoStreamCachingTest.java | 3 +-
.../component/jms/JmsStreamMessageTypeTest.java | 3 +-
.../camel/component/jms/JmsSuspendResumeTest.java | 10 +-
.../jms/JmsThrottlingInflightRoutePolicyTest.java | 2 +-
.../org/apache/camel/component/jms/JmsToDTest.java | 3 +-
.../org/apache/camel/component/jms/JmsToTest.java | 3 +-
.../jms/JmsTransferExchangeFromSplitterTest.java | 2 +-
.../component/jms/JmsTransferExchangeTest.java | 6 +-
.../component/jms/JmsUseOriginalBodyTest.java | 4 +-
.../camel/component/jms/JmsXMLRouteTest.java | 18 ++--
.../camel/component/jms/JmsXPathHeaderTest.java | 7 +-
.../component/jms/ManagedJmsEndpointTest.java | 3 +-
.../component/jms/ManagedJmsEndpointTopicTest.java | 3 +-
.../component/jms/ManagedJmsSelectorTest.java | 7 +-
.../camel/component/jms/MapJmsMessageTest.java | 4 +-
.../component/jms/PayloadByteArrayJmsTest.java | 6 +-
.../component/jms/ProduceMessageConverterTest.java | 2 +-
.../jms/ReplyToDestinationSelectorNameTest.java | 2 +-
.../jms/SpringJmsRoutingSlipInOutTest.java | 3 +-
.../component/jms/SpringJmsXPathHeaderTest.java | 7 +-
.../component/jms/TwoConsumerOnSameQueueTest.java | 13 +--
.../component/jms/TwoConsumerOnSameTopicTest.java | 19 ++--
.../ActiveMQConsumeWildcardQueuesTest.java | 3 +-
.../activemq/TwoEmbeddedActiveMQBrokersTest.java | 3 +-
.../jms/async/AsyncConsumerFalseTest.java | 3 +-
.../jms/async/AsyncConsumerInOutTest.java | 3 +-
.../component/jms/async/AsyncConsumerTest.java | 3 +-
.../component/jms/async/AsyncJmsInOutTest.java | 2 +-
.../component/jms/async/AsyncJmsProducerTest.java | 3 +-
.../component/jms/bind/JmsMessageBindTest.java | 2 +-
.../component/jms/discovery/JmsDiscoveryTest.java | 2 +-
.../component/jms/issues/AdviceWithIssueTest.java | 2 +-
...cRoutersWithJMSMessageLostHeadersIssueTest.java | 7 +-
.../jms/issues/JmsAnotherCustomJMSReplyToTest.java | 2 +-
.../issues/JmsChainedEndpointDelayTimeoutTest.java | 5 +-
.../issues/JmsConcurrentConsumerInOnlyTest.java | 3 +-
.../jms/issues/JmsCustomJMSReplyToIssueTest.java | 2 +-
.../jms/issues/JmsDirectStartupOrderIssueTest.java | 3 +-
.../jms/issues/JmsGetHeaderKeyFormatIssueTest.java | 2 +-
...derKeyFormatIssueWithContentTypeHeaderTest.java | 2 +-
.../component/jms/issues/JmsInOnlyIssueTest.java | 10 +-
.../jms/issues/JmsInOnlyParameterTest.java | 5 +-
.../JmsInOutExclusiveTopicRecipientListTest.java | 3 +-
.../jms/issues/JmsInOutExclusiveTopicTest.java | 3 +-
.../issues/JmsInOutPersistentReplyQueueTest.java | 3 +-
.../jms/issues/JmsInOutRoutingSlipTest.java | 3 +-
...ransferExchangeInflightRepositoryFlushTest.java | 2 +-
.../JmsJMSReplyToEndpointUsingInOutTest.java | 2 +-
.../jms/issues/JmsLifecycleIssueTest.java | 3 +-
.../jms/issues/JmsMQSpecialHeaderTest.java | 4 +-
.../JmsMessageHeaderContentBasedRouterTest.java | 3 +-
.../component/jms/issues/JmsMutateMessageTest.java | 2 +-
.../issues/JmsMutateRemoveHeaderMessageTest.java | 2 +-
...roughtJmsKeyFormatStrategyEndUserIssueTest.java | 2 +-
...ssThroughtJmsKeyFormatStrategyEndpointTest.java | 2 +-
.../JmsPassThroughtJmsKeyFormatStrategyTest.java | 2 +-
...KeyFormatStrategyUsingJmsConfigurationTest.java | 2 +-
.../jms/issues/JmsReplyToLoopIssueTest.java | 3 +-
.../component/jms/issues/JmsResequencerTest.java | 2 +-
.../jms/issues/JmsRoutingSlipIssueTest.java | 3 +-
.../jms/issues/JmsTXForceShutdownIssueTest.java | 2 +-
.../jms/issues/JmsToFileMessageIdTest.java | 2 +-
.../jms/issues/JmsTypeConverterIssueTest.java | 2 +-
.../camel/component/jms/issues/LarsIssueTest.java | 2 +-
...TransactionErrorHandlerRedeliveryDelayTest.java | 3 +-
...tReplyTemporaryRefreshFailureOnStartupTest.java | 2 +-
.../jms/tuning/PerformanceRoutePojoTest.java | 3 +-
.../component/jms/tuning/PerformanceRouteTest.java | 3 +-
.../component/jms/tx/AsyncEndpointJmsTX2Test.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXMulticastTest.java | 3 +-
.../tx/AsyncEndpointJmsTXRecipientListTest.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXRollback2Test.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXRollbackTest.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java | 3 +-
.../component/jms/tx/AsyncEndpointJmsTXTest.java | 3 +-
.../tx/AsyncEndpointJmsTXTryCatchFinallyTest.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXWireTapTest.java | 3 +-
.../jms/tx/JMSTXInOutPersistentQueueTest.java | 3 +-
.../jms/tx/JMSTransactionRollbackTest.java | 3 +-
.../JMSTransactionThrottlingRoutePolicyTest.java | 2 +-
.../component/jms/tx/JMXTXUseOriginalBodyTest.java | 4 +-
...MXTXUseOriginalBodyWithDLCErrorHandlerTest.java | 6 +-
...JMXTXUseOriginalBodyWithTXErrorHandlerTest.java | 4 +-
.../jms/tx/JmsToJmsTransactedSecurityTest.java | 2 +-
.../component/jms/tx/JmsToJmsTransactedTest.java | 6 +-
.../component/jms/tx/RouteIdTransactedTest.java | 5 +-
.../jms/tx/TransactedAsyncUsingThreadsTest.java | 5 +-
.../jms/tx/TransactedOnCompletionTest.java | 3 +-
.../tx/TransactionInterceptSendToEndpointTest.java | 3 +-
...sumerObserveAttributeMatchStringDifferTest.java | 3 +-
...JmxConsumerObserveAttributeMatchStringTest.java | 3 +-
.../jmx/CamelJmxConsumerObserveAttributeTest.java | 3 +-
.../camel/component/jmx/CamelJmxConsumerTest.java | 3 +-
.../component/johnzon/JohnzonSkipNullTest.java | 2 +-
.../camel/component/jolt/JoltFirstSampleTest.java | 3 +-
.../camel/component/jooq/JooqConsumerTest.java | 4 +-
.../camel/component/jooq/JooqPlainSQLTest.java | 2 +-
.../language/joor/JoorBeanInjectTransformTest.java | 3 +-
.../camel/language/joor/JoorBeanInjectVarTest.java | 3 +-
.../apache/camel/language/joor/JoorBeanTest.java | 3 +-
.../camel/language/joor/JoorCustomAliasTest.java | 3 +-
.../camel/language/joor/JoorCustomImportsTest.java | 3 +-
.../language/joor/JoorOptionalPredicateTest.java | 3 +-
.../language/joor/JoorPreCompileFalseTest.java | 7 +-
.../camel/language/joor/JoorPredicateTest.java | 3 +-
.../language/joor/JoorStreamPredicateTest.java | 3 +-
.../language/joor/JoorTransformResourceTest.java | 3 +-
.../camel/language/joor/JoorTransformTest.java | 3 +-
.../jpa/FileConsumerJpaIdempotentTest.java | 4 +-
.../camel/processor/jpa/JpaBatchConsumerTest.java | 2 +-
.../camel/processor/jpa/JpaCronSchedulerTest.java | 2 +-
.../camel/processor/jpa/JpaFlushOnSendTest.java | 2 +-
.../processor/jpa/JpaIdempotentConsumerTest.java | 4 +-
.../camel/processor/jpa/JpaNonTXRollbackTest.java | 3 +-
.../jpa/JpaPollingConsumerLockEntityTest.java | 4 +-
.../processor/jpa/JpaPollingConsumerTest.java | 2 +-
.../camel/processor/jpa/JpaPreConsumedTest.java | 2 +-
.../processor/jpa/JpaProducerConcurrentTest.java | 3 +-
.../processor/jpa/JpaProducerFindEntityTest.java | 3 +-
.../jpa/JpaProducerPreserveHeadersTest.java | 2 +-
.../jpa/JpaRouteConsumeLockEntityTest.java | 2 +-
.../processor/jpa/JpaRouteMaximumResultsTest.java | 2 +-
.../jpa/JpaRouteSharedEntityManagerTest.java | 4 +-
.../jpa/JpaRouteSkipLockedEntityTest.java | 2 +-
.../apache/camel/processor/jpa/JpaRouteTest.java | 2 +-
.../jpa/JpaRoutemaxMessagesPerPollTest.java | 2 +-
.../camel/processor/jpa/JpaTXRollbackTest.java | 2 +-
.../camel/processor/jpa/JpaTransactedTest.java | 3 +-
.../apache/camel/processor/jpa/JpaWireTapTest.java | 2 +-
.../jpa/MultipleJpaRouteEndpointTest.java | 2 +-
.../jq/JqExpressionFromHeaderAsStringTest.java | 3 +-
.../jq/JqExpressionFromHeaderOrPropertyTest.java | 7 +-
.../language/jq/JqExpressionFromHeaderTest.java | 7 +-
.../language/jq/JqExpressionFromPropertyTest.java | 5 +-
.../language/jq/JqExpressionHeaderFnTest.java | 3 +-
.../camel/language/jq/JqExpressionPojoTest.java | 3 +-
.../language/jq/JqExpressionPropertyFnTest.java | 3 +-
.../camel/language/jq/JqExpressionSimpleTest.java | 3 +-
.../apache/camel/language/jq/JqFilterGETest.java | 5 +-
.../org/apache/camel/language/jq/JqFilterTest.java | 3 +-
.../camel/component/scp/ScpAlgorithmsTest.java | 3 +-
.../camel/component/scp/ScpSimpleProduceTest.java | 17 ++--
.../apache/camel/component/jslt/JsltBasicTest.java | 11 ++-
.../jslt/JsltBigDecimalCustomObjectMapperTest.java | 3 +-
.../camel/component/jslt/JsltBigDecimalTest.java | 3 +-
.../camel/component/jslt/JsltFileSourceTest.java | 9 +-
.../camel/component/jslt/JsltFunctionsTest.java | 3 +-
.../camel/component/jslt/JsltObjectFilterTest.java | 3 +-
.../apache/camel/component/jslt/JsltQueryTest.java | 3 +-
.../camel/component/jslt/JsltVariablesTest.java | 5 +-
.../jsonvalidator/ValidatorInputStreamTest.java | 3 +-
.../component/jsonapi/JsonApiDataFormatTest.java | 4 +-
.../component/jsonata/JsonataFirstSampleTest.java | 3 +-
.../camel/component/jsonb/JsonbSkipNullTest.java | 2 +-
.../jsonpath/JsonPathBeanStreamCachingTest.java | 3 +-
.../JsonPathBeanSuppressExceptionsTest.java | 5 +-
.../apache/camel/jsonpath/JsonPathBeanTest.java | 7 +-
.../org/apache/camel/jsonpath/JsonPathCBRTest.java | 11 ++-
.../apache/camel/jsonpath/JsonPathCharsetTest.java | 9 +-
.../jsonpath/JsonPathChoicePrimitiveTest.java | 3 +-
.../jsonpath/JsonPathExchangePropertyTest.java | 3 +-
.../camel/jsonpath/JsonPathHeaderNameTest.java | 3 +-
.../camel/jsonpath/JsonPathMapTransformTest.java | 3 +-
.../camel/jsonpath/JsonPathPojoTransformTest.java | 3 +-
.../apache/camel/jsonpath/JsonPathSourceTest.java | 7 +-
.../apache/camel/jsonpath/JsonPathSplitTest.java | 2 +-
.../JsonPathSplitWriteAsStringMapTest.java | 2 +-
...PathSplitWriteAsStringResultTypeStringTest.java | 2 +-
.../jsonpath/JsonPathSplitWriteAsStringTest.java | 2 +-
.../jsonpath/JsonPathStreamCachingCBRTest.java | 11 ++-
.../camel/jsonpath/JsonPathSuppressTest.java | 5 +-
.../jsonpath/JsonPathTransformHeaderNameTest.java | 3 +-
.../JsonPathTransformONielEscapedTest.java | 3 +-
.../JsonPathTransformONielPlaceholderTest.java | 3 +-
.../camel/jsonpath/JsonPathTransformONielTest.java | 3 +-
.../jsonpath/JsonPathTransformResultTypeTest.java | 3 +-
.../camel/jsonpath/JsonPathTransformTest.java | 3 +-
.../camel/jsonpath/JsonPathWithSimpleCBRTest.java | 7 +-
.../camel/jsonpath/SpringJsonPathCBRTest.java | 7 +-
.../SpringJsonPathCustomReadMapperBeanTest.java | 2 +-
.../SpringJsonPathSplitWriteAsStringTest.java | 2 +-
.../camel/jsonpath/SpringJsonPathSuppressTest.java | 5 +-
.../SpringJsonPathTransformHeaderNameTest.java | 3 +-
.../SpringJsonPathTransformResultTypeTest.java | 3 +-
.../jsonpath/SpringJsonPathTransformTest.java | 3 +-
.../EasyJsonPathWithRootSimpleCBRTest.java | 7 +-
.../EasyJsonPathWithSimpleCBRTest.java | 7 +-
.../component/kamelet/KameletAggregateTest.java | 3 +-
.../kamelet/KameletConsumerUoWIssueTest.java | 3 +-
.../kamelet/KameletEipAggregateGroovyTest.java | 3 +-
.../kamelet/KameletEipAggregateJoorTest.java | 3 +-
.../component/kamelet/KameletEipAggregateTest.java | 3 +-
.../component/kamelet/KameletEipFilterTest.java | 3 +-
.../component/kamelet/KameletEipMulticastTest.java | 5 +-
.../camel/component/kamelet/KameletEipTest.java | 5 +-
.../kamelet/KameletLocalBeanClassFourTest.java | 3 +-
.../kamelet/KameletLocalBeanClassTest.java | 3 +-
.../kamelet/KameletLocalBeanClassThreeTest.java | 3 +-
.../kamelet/KameletLocalBeanClassTwoTest.java | 3 +-
.../kamelet/KameletLocalBeanConfigureTest.java | 5 +-
.../KameletLocalBeanGroovyExternalTest.java | 5 +-
.../kamelet/KameletLocalBeanGroovyTest.java | 3 +-
.../component/kamelet/KameletLocalBeanIoCTest.java | 5 +-
.../kamelet/KameletLocalBeanJoorExternalTest.java | 5 +-
.../kamelet/KameletLocalBeanLanguageTest.java | 5 +-
.../kamelet/KameletLocalBeanSupplierTest.java | 3 +-
.../component/kamelet/KameletLocalBeanTest.java | 5 +-
.../kamelet/KameletLocalBeanTypeTest.java | 3 +-
.../component/kamelet/KameletLocationTest.java | 5 +-
.../kamelet/KameletRecipientListTest.java | 3 +-
.../camel/component/kamelet/KameletToDTest.java | 3 +-
.../component/kamelet/KameletUoWIssueTest.java | 3 +-
.../component/kamelet/KameletWireTapTest.java | 3 +-
.../kamelet/TemplatedRouteKameletTest.java | 3 +-
.../cloud/ServiceCallClientRouteManualTest.java | 3 +-
.../ServiceCallEnvironmentRouteManualTest.java | 3 +-
.../SpringServiceCallClientRouteManualTest.java | 3 +-
.../cloud/SpringServiceCallDnsRouteManualTest.java | 3 +-
...pringServiceCallEnvironmentRouteManualTest.java | 3 +-
...elDBAggregateConcurrentDifferentGroupsTest.java | 2 +-
.../LevelDBAggregateConcurrentSameGroupTest.java | 2 +-
.../LevelDBAggregateForceCompletionHeaderTest.java | 9 +-
.../LevelDBAggregateLoadAndRecoverTest.java | 2 +-
.../LevelDBAggregateLoadConcurrentTest.java | 2 +-
.../leveldb/LevelDBAggregateLoadTest.java | 2 +-
...DBAggregateNotLostRemovedWhenConfirmedTest.java | 3 +-
.../leveldb/LevelDBAggregateNotLostTest.java | 3 +-
...ggregateRecoverDeadLetterChannelFailedTest.java | 3 +-
...velDBAggregateRecoverDeadLetterChannelTest.java | 3 +-
.../leveldb/LevelDBAggregateRecoverTest.java | 3 +-
...DBAggregateRecoverWithRedeliveryPolicyTest.java | 3 +-
.../LevelDBAggregateRecoverWithSedaTest.java | 3 +-
.../LevelDBAggregateSerializedHeadersTest.java | 2 +-
.../component/leveldb/LevelDBAggregateTest.java | 2 +-
...velDBAggregateTimeoutCompletionRestartTest.java | 2 +-
.../camel/component/leveldb/LevelDBBinaryTest.java | 2 +-
.../leveldb/LevelDBCustomSerializationTest.java | 2 +-
...ngAggregateRecoverWithRedeliveryPolicyTest.java | 3 +-
.../leveldb/LevelDBSpringAggregateTest.java | 2 +-
.../mail/AdditionalMailPropertiesTest.java | 2 +-
.../camel/component/mail/FromFileSendMailTest.java | 2 +-
.../component/mail/MailBatchConsumerTest.java | 2 +-
.../mail/MailConsumerIdleMessageTest.java | 2 +-
.../camel/component/mail/MailConvertersTest.java | 10 +-
.../camel/component/mail/MailCopyToTest.java | 2 +-
.../camel/component/mail/MailDisconnectTest.java | 2 +-
.../mail/MailDoNotDeleteIfProcessFailsTest.java | 3 +-
...IdempotentRepositoryDuplicateNotRemoveTest.java | 2 +-
.../MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../mail/MailIdempotentRepositoryTest.java | 2 +-
.../component/mail/MailMaxMessagesPerPollTest.java | 4 +-
.../camel/component/mail/MailMoveToTest.java | 4 +-
.../component/mail/MailMultipleRecipientsTest.java | 4 +-
.../mail/MailNameAndEmailInRecipientTest.java | 2 +-
.../component/mail/MailPostProcessActionTest.java | 2 +-
.../component/mail/MailProducerConcurrentTest.java | 3 +-
.../camel/component/mail/MailProducerTest.java | 5 +-
.../component/mail/MailSearchTermNotSpamTest.java | 2 +-
.../camel/component/mail/MailSearchTermTest.java | 2 +-
.../MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../mail/MailSearchTermUriConfigTest.java | 2 +-
.../mail/MailShutdownCompleteAllTasksTest.java | 2 +-
.../MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../camel/component/mail/MailSortTermTest.java | 2 +-
.../component/mail/MailSortTermThreeTest.java | 2 +-
.../camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../camel/component/mail/RawMailMessageTest.java | 6 +-
.../component/mapstruct/CamelVehicleToCarTest.java | 3 +-
.../mapstruct/ComponentVehicleToCarTest.java | 5 +-
.../metrics/MetricsComponentRouteTest.java | 6 +-
.../ExceptionRouteMetricsMessageHistoryTest.java | 3 +-
.../messagehistory/ManagedMessageHistoryTest.java | 7 +-
.../messagehistory/MetricsMessageHistoryTest.java | 3 +-
.../SpringMetricsMessageHistoryTest.java | 3 +-
.../routepolicy/ManagedMetricsRoutePolicyTest.java | 3 +-
.../MetricsRoutePolicyMulticastSubRouteTest.java | 3 +-
.../MetricsRoutePolicySubRouteTest.java | 3 +-
.../routepolicy/MetricsRoutePolicyTest.java | 3 +-
.../micrometer/MicrometerComponentRouteTest.java | 4 +-
...ExceptionRouteMicrometerMessageHistoryTest.java | 3 +-
.../messagehistory/ManagedMessageHistoryTest.java | 3 +-
.../MicrometerMessageHistoryTest.java | 3 +-
.../SpringMicrometerMessageHistoryTest.java | 3 +-
.../ManagedMicrometerRoutePolicyTest.java | 3 +-
.../MicrometerRoutePolicyExchangeStatusTest.java | 2 +-
...MicrometerRoutePolicyMulticastSubRouteTest.java | 3 +-
.../MicrometerRoutePolicySubRouteTest.java | 3 +-
.../routepolicy/MicrometerRoutePolicyTest.java | 2 +-
.../CamelMicroProfilePropertiesSourceTest.java | 3 +-
.../FaultToleranceInheritErrorHandlerTest.java | 3 +-
.../FaultToleranceManagementTest.java | 3 +-
...tToleranceRefConfigurationNoReflectionTest.java | 3 +-
.../FaultToleranceRefConfigurationTest.java | 3 +-
.../FaultToleranceRouteBulkheadFallbackTest.java | 3 +-
.../FaultToleranceRouteBulkheadOkTest.java | 3 +-
.../FaultToleranceRouteFallbackTest.java | 3 +-
.../faulttolerance/FaultToleranceRouteOkTest.java | 3 +-
.../FaultToleranceRouteRejectedTest.java | 3 +-
.../SpringFaultToleranceRouteFallbackTest.java | 3 +-
.../SpringFaultToleranceRouteOkTest.java | 3 +-
...eMetricsExceptionInRouteMessageHistoryTest.java | 3 +-
.../MicroProfileMetricsMessageHistoryTest.java | 3 +-
...ileMetricsRoutePolicyMulticastSubRouteTest.java | 3 +-
...MicroProfileMetricsRoutePolicySubRouteTest.java | 3 +-
.../policy/MicroProfileMetricsRoutePolicyTest.java | 2 +-
.../milo/MonitorItemMultiConnectionsCertTest.java | 2 +-
.../milo/MonitorItemMultiConnectionsTest.java | 2 +-
.../camel/component/milo/MonitorItemTest.java | 2 +-
.../camel/component/milo/WriteClientTest.java | 6 +-
.../camel/component/mina/MessageIOSessionTest.java | 4 +-
.../camel/component/mina/MinaConsumerTest.java | 2 +-
.../camel/component/mina/MinaCustomCodecTest.java | 2 +-
.../camel/component/mina/MinaEncodingTest.java | 10 +-
.../camel/component/mina/MinaFileTcpTest.java | 2 +-
.../camel/component/mina/MinaFileUdpTest.java | 2 +-
.../camel/component/mina/MinaFiltersTest.java | 2 +-
.../camel/component/mina/MinaInOnlyRouteTest.java | 2 +-
.../camel/component/mina/MinaInOutRouteTest.java | 2 +-
.../mina/MinaInOutRouteTextLineDelimiterTest.java | 2 +-
.../mina/MinaProducerAnotherConcurrentTest.java | 3 +-
.../component/mina/MinaProducerConcurrentTest.java | 3 +-
.../mina/MinaProducerShutdownMockTest.java | 2 +-
.../component/mina/MinaSpringMinaEndpointTest.java | 2 +-
.../mina/MinaSpringMinaEndpointUDPTest.java | 2 +-
.../component/mina/MinaSpringMultipleUDPTest.java | 2 +-
.../mina/MinaSslContextParametersTcpTest.java | 2 +-
.../mina/MinaSslContextParametersUdpTest.java | 2 +-
.../mina/MinaSslContextParametersVmTest.java | 2 +-
.../MinaSslGlobalContextParametersTcpTest.java | 2 +-
.../apache/camel/component/mina/MinaTcpTest.java | 4 +-
.../mina/MinaTcpTextlineDelimiterTest.java | 2 +-
.../mina/MinaTcpTextlineProtocolTest.java | 2 +-
.../component/mina/MinaUdpConcurrentTest.java | 2 +-
.../apache/camel/component/mina/MinaUdpTest.java | 2 +-
.../component/mina/MinaUdpUsingTemplateTest.java | 6 +-
.../component/mina/MinaVMCustomCodecTest.java | 2 +-
.../camel/component/mina/MinaVMFileTcpTest.java | 2 +-
.../component/mina/MinaVMTextlineProtocolTest.java | 2 +-
.../apache/camel/component/mina/MinaVmTest.java | 2 +-
.../minio/integration/MinioComponentIT.java | 4 +-
.../minio/integration/MinioConsumerIT.java | 2 +-
.../integration/MinioCopyObjectOperationIT.java | 2 +-
.../integration/MinioDeleteBucketOperationIT.java | 2 +-
.../integration/MinioListObjectsOperationIT.java | 2 +-
.../integration/MinioObjectRangeOperationIT.java | 2 +-
.../mllp/MllpIdleTimeoutStrategyTest.java | 4 +-
.../mllp/MllpMaxConcurrentConsumersTest.java | 4 +-
.../MllpProducerConsumerLoopbackInOnlyTest.java | 2 +-
.../mllp/MllpProducerConsumerLoopbackTest.java | 4 +-
.../MllpTcpClientProducerConnectionErrorTest.java | 14 +--
...TcpClientProducerIdleConnectionTimeoutTest.java | 4 +-
.../component/mllp/MllpTcpServerCharsetTest.java | 4 +-
.../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 2 +-
.../mllp/MllpTcpServerConsumerConnectionTest.java | 6 +-
.../MllpTcpServerConsumerMessageHeadersTest.java | 4 +-
...MllpTcpServerConsumerMulitpleTcpPacketTest.java | 4 +-
.../mllp/MllpTcpServerConsumerTransactionTest.java | 4 +-
...tProducerEndOfDataAndValidationTestSupport.java | 2 +-
...cpServerConsumerAcknowledgementTestSupport.java | 6 +-
...rConsumerEndOfDataAndValidationTestSupport.java | 4 +-
.../component/mustache/MustacheComponentTest.java | 12 +--
.../apache/camel/language/mvel/MvelFilterTest.java | 3 +-
.../camel/language/mvel/MvelResourceTest.java | 3 +-
.../mybatis/MyBatisBatchConsumerTest.java | 2 +-
.../mybatis/MyBatisConsumerIdleMessageTest.java | 2 +-
.../component/mybatis/MyBatisDeleteListTest.java | 4 +-
.../camel/component/mybatis/MyBatisDeleteTest.java | 4 +-
.../component/mybatis/MyBatisExecutorTypeTest.java | 2 +-
.../component/mybatis/MyBatisInsertListTest.java | 2 +-
.../camel/component/mybatis/MyBatisInsertTest.java | 4 +-
.../MyBatisInsertWithInputAndOutputHeaderTest.java | 2 +-
.../mybatis/MyBatisInsertWithInputHeaderTest.java | 2 +-
.../mybatis/MyBatisInsertWithOutputHeaderTest.java | 2 +-
.../mybatis/MyBatisInsertWithRollbackTest.java | 3 +-
.../mybatis/MyBatisPollingDelayRouteTest.java | 2 +-
.../camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../mybatis/MyBatisRouteEmptyResultSetTest.java | 2 +-
.../component/mybatis/MyBatisSelectListTest.java | 2 +-
.../mybatis/MyBatisSelectListWithSplitTest.java | 2 +-
...SelectOneExchangeInOutWithOutputHeaderTest.java | 2 +-
.../component/mybatis/MyBatisSelectOneTest.java | 4 +-
...BatisSelectOneWithInputAndOutputHeaderTest.java | 4 +-
.../MyBatisSelectOneWithInputHeaderTest.java | 4 +-
.../MyBatisSelectOneWithOutputHeaderTest.java | 2 +-
.../mybatis/MyBatisShutdownAllTasksTest.java | 2 +-
.../MyBatisShutdownCurrentTaskOnlyTest.java | 2 +-
.../component/mybatis/MyBatisUpdateListTest.java | 2 +-
.../camel/component/mybatis/MyBatisUpdateTest.java | 2 +-
.../mybatis/bean/MyBatisBeanInsertTest.java | 2 +-
.../mybatis/bean/MyBatisBeanSelectListTest.java | 2 +-
.../mybatis/bean/MyBatisBeanSelectOneTest.java | 4 +-
.../MyBatisBeanSelectOneWithInputHeaderTest.java | 4 +-
.../MyBatisBeanSelectOneWithOutputHeaderTest.java | 2 +-
.../netty/http/ManagedNettyEndpointTest.java | 3 +-
.../netty/http/NettyCamelWebsiteManualTest.java | 3 +-
.../netty/http/NettyDefaultProtocolTest.java | 3 +-
.../netty/http/NettyHttp500ErrorTest.java | 7 +-
...ettyHttp500ErrorThrowExceptionOnServerTest.java | 5 +-
...tyHttpAccessHttpRequestAndResponseBeanTest.java | 3 +-
.../http/NettyHttpAccessHttpRequestBeanTest.java | 3 +-
.../netty/http/NettyHttpAccessHttpRequestTest.java | 3 +-
.../NettyHttpBasicAuthConstraintMapperTest.java | 3 +-
...tpBasicAuthCustomSecurityAuthenticatorTest.java | 3 +-
.../netty/http/NettyHttpBasicAuthTest.java | 3 +-
.../netty/http/NettyHttpBridgeEncodedPathTest.java | 2 +-
.../netty/http/NettyHttpClientChunkedTest.java | 3 +-
.../http/NettyHttpClientExpectContinueTest.java | 3 +-
.../netty/http/NettyHttpContentTypeTest.java | 7 +-
.../http/NettyHttpEmptyQueryParameterTest.java | 7 +-
...pEndpointUriCustomHeaderFilterStrategyTest.java | 2 +-
.../NettyHttpGetWithParamAsExchangeHeaderTest.java | 16 ++--
.../netty/http/NettyHttpGetWithParamTest.java | 4 +-
.../netty/http/NettyHttpHandle404Test.java | 2 +-
.../NettyHttpHeaderFilterStrategyRemovalTest.java | 4 +-
.../component/netty/http/NettyHttpHeadersTest.java | 3 +-
.../netty/http/NettyHttpPostDataTest.java | 3 +-
.../netty/http/NettyHttpProducerBridgeTest.java | 4 +-
.../http/NettyHttpProducerConcurrentTest.java | 3 +-
.../netty/http/NettyHttpProducerHttpPathTest.java | 8 +-
.../netty/http/NettyHttpProducerKeepAliveTest.java | 7 +-
.../http/NettyHttpProducerSendEmptyHeaderTest.java | 2 +-
.../netty/http/NettyHttpProducerSessionTest.java | 7 +-
.../netty/http/NettyHttpProducerSimpleGetTest.java | 7 +-
.../netty/http/NettyHttpProducerSimpleTest.java | 5 +-
.../http/NettyHttpProducerWithHeaderTest.java | 5 +-
.../netty/http/NettyHttpProtocolNoSlashTest.java | 3 +-
.../netty/http/NettyHttpRawQueryTest.java | 2 +-
.../netty/http/NettyHttpRedeliveryTest.java | 3 +-
.../netty/http/NettyHttpSSLHandshakeErrorTest.java | 3 +-
.../component/netty/http/NettyHttpSSLTest.java | 3 +-
.../NettyHttpSameHostDifferentParametersTest.java | 3 +-
...ttyHttpSimpleBasicAuthConstraintMapperTest.java | 3 +-
.../netty/http/NettyHttpSimpleBasicAuthTest.java | 3 +-
.../http/NettyHttpSimplePooledExchangeTest.java | 5 +-
.../component/netty/http/NettyHttpSimpleTest.java | 3 +-
.../http/NettyHttpSimpleUriParametersTest.java | 3 +-
.../netty/http/NettyHttpTransferExceptionTest.java | 3 +-
...ttyHttpTwoRoutesBootstrapConfigurationTest.java | 3 +-
.../NettyHttpTwoRoutesMatchOnUriPrefixTest.java | 3 +-
.../http/NettyHttpTwoRoutesStopOneRouteTest.java | 7 +-
.../netty/http/NettyHttpTwoRoutesTest.java | 3 +-
.../component/netty/http/NettyMDCLoggingTest.java | 3 +-
.../netty/http/NettyMixedCaseHttpPathTest.java | 3 +-
.../netty/http/NettyRecipientListHttpBaseTest.java | 3 +-
.../netty/http/NettyRouteSimpleDynamicURITest.java | 3 +-
.../component/netty/http/NettyRouteSimpleTest.java | 3 +-
.../netty/http/NettySharedHttpServerTest.java | 3 +-
.../netty/http/NettyUseRawHttpResponseTest.java | 3 +-
.../RestNettyHttpBindingModeAutoWithJsonTest.java | 2 +-
.../RestNettyHttpBindingModeAutoWithXmlTest.java | 2 +-
.../rest/RestNettyHttpBindingModeJsonTest.java | 4 +-
...stNettyHttpBindingModeJsonWithContractTest.java | 2 +-
...estNettyHttpBindingModeOffWithContractTest.java | 2 +-
.../http/rest/RestNettyHttpBindingModeXmlTest.java | 4 +-
.../netty/http/rest/RestNettyHttpGetCorsTest.java | 7 +-
.../rest/RestNettyHttpPostJsonJaxbPojoTest.java | 2 +-
.../rest/RestNettyHttpPostJsonPojoListTest.java | 2 +-
.../http/rest/RestNettyHttpPostJsonPojoTest.java | 2 +-
.../rest/RestNettyHttpPostXmlJaxbPojoTest.java | 4 +-
.../netty/http/rest/RestNettyHttpVerbTest.java | 6 +-
.../netty/http/rest/RestNettyProducerPutTest.java | 3 +-
.../NettyConsumerClientModeReconnectTest.java | 2 +-
.../component/netty/NettyCustomCodecTest.java | 3 +-
.../netty/NettyCustomCorrelationManagerTest.java | 2 +-
.../camel/component/netty/NettyFileTcpTest.java | 2 +-
.../component/netty/NettyInOutFromSedaTest.java | 2 +-
.../component/netty/NettyManualEndpointTest.java | 3 +-
.../NettyMultipleSimultaneousClientsTest.java | 3 +-
.../netty/NettyProducerAsyncEndpointTest.java | 3 +-
.../camel/component/netty/NettyProxyTest.java | 3 +-
.../netty/NettyReuseChannelCallbackTest.java | 3 +-
.../component/netty/NettyReuseChannelTest.java | 3 +-
.../netty/NettySSLClientCertHeadersTest.java | 3 +-
.../component/netty/NettySuspendResumeTest.java | 3 +-
.../NettyTextlineInOnlyNullDelimiterTest.java | 3 +-
.../NettyTextlineInOnlyPooledExchangeTest.java | 5 +-
.../component/netty/NettyTextlineInOnlyTest.java | 7 +-
.../netty/NettyTextlineInOutNonBlockingTest.java | 3 +-
.../NettyTextlineInOutSynchronousFalseTest.java | 3 +-
.../netty/NettyTextlineInOutSynchronousTest.java | 3 +-
.../component/netty/NettyTextlineInOutTest.java | 3 +-
.../netty/NettyUDPByteArrayConsumerTest.java | 2 +-
.../netty/NettyUDPLargeMessageInOnlyTest.java | 3 +-
...yUDPMessageLargerThanDefaultBufferSizeTest.java | 3 +-
.../netty/NettyUseSharedWorkerThreadPoolTest.java | 3 +-
.../SpringNettyUseSharedWorkerThreadPoolTest.java | 3 +-
.../camel/language/ognl/OgnlInvokeMethodTest.java | 2 +-
.../camel/language/ognl/OgnlResourceTest.java | 3 +-
.../camel/language/ognl/patterns/FilterTest.java | 5 +-
.../camel/openapi/producer/RestOpenApiGetTest.java | 3 +-
.../producer/RestOpenApiGetUriParamTest.java | 3 +-
.../mqtt5/PahoMqtt5OverrideTopicMqtt5Test.java | 3 +-
.../component/paho/mqtt5/PahoMqtt5ToDTest.java | 3 +-
.../component/paho/PahoOverrideTopicTest.java | 3 +-
.../apache/camel/component/paho/PahoToDTest.java | 3 +-
.../camel/component/printer/PrinterPrintTest.java | 3 +-
.../camel/component/pubnub/PubNubFireTest.java | 2 +-
.../camel/component/pubnub/PubNubPresenceTest.java | 4 +-
.../camel/component/pubnub/PubNubPublishTest.java | 4 +-
.../component/pubnub/PubNubSubscriberTest.java | 2 +-
.../pubnub/example/PubNubStateExample.java | 5 +-
.../PulsarConsumerDeadLetterPolicyIT.java | 6 +-
.../integration/PulsarConsumerPatternInIT.java | 4 +-
.../pulsar/integration/PulsarSuspendRouteIT.java | 12 +--
.../quartz/DelegateEndpointQuartzTest.java | 2 +-
.../quartz/QuartUnderscoreTimerNameTest.java | 2 +-
...uartzAddRoutesAfterCamelContextStartedTest.java | 2 +-
.../component/quartz/QuartzAutoStartTest.java | 6 +-
.../component/quartz/QuartzCronRouteTest.java | 2 +-
.../quartz/QuartzCronTriggerRouteTest.java | 2 +-
.../quartz/QuartzCustomCalendarFireTest.java | 2 +-
.../quartz/QuartzCustomCalendarNoFireTest.java | 2 +-
.../quartz/QuartzJobRouteUnderscoreTest.java | 2 +-
.../component/quartz/QuartzManagementTest.java | 3 +-
.../quartz/QuartzManuallyTriggerJobTest.java | 2 +-
.../component/quartz/QuartzRouteRestartTest.java | 6 +-
.../component/quartz/QuartzSimpleRouteTest.java | 2 +-
.../quartz/QuartzStatefulJobRouteTest.java | 2 +-
.../component/quartz/QuartzStopRouteTest.java | 8 +-
.../component/quartz/QuartzSuspendRouteTest.java | 8 +-
.../quartz/QuartzTriggerParametersTest.java | 3 +-
.../quartz/SpringQuartzCronRouteTest.java | 2 +-
...pringQuartzPersistentStoreRestartRouteTest.java | 6 +-
.../quartz/SpringQuartzPersistentStoreTest.java | 2 +-
.../FileConsumerQuartzSchedulerRestartTest.java | 7 +-
.../quartz/FileConsumerQuartzSchedulerTest.java | 3 +-
.../RouteAutoStopFalseCronScheduledPolicyTest.java | 3 +-
.../quartz/SpringMultiplePoliciesOnRouteTest.java | 3 +-
.../rabbitmq/integration/RabbitMQLoadIT.java | 2 +-
.../integration/RabbitMQReConnectionIT.java | 2 +-
.../integration/RabbitMQSupendResumeIT.java | 10 +-
.../rabbitmq/integration/RabbitMQToDIT.java | 3 +-
.../org/apache/camel/reactive/SimpleMockTest.java | 4 +-
.../camel/reactive/SimpleMockLookupVertxTest.java | 4 +-
.../org/apache/camel/reactive/SimpleMockTest.java | 4 +-
.../aggregate/integration/AggregateRedisIT.java | 2 +-
.../ResilienceExistingCircuitBreakerTest.java | 3 +-
.../ResilienceInheritErrorHandlerTest.java | 3 +-
.../resilience4j/ResilienceManagementTest.java | 3 +-
.../ResilienceRouteBulkheadFallbackTest.java | 3 +-
.../ResilienceRouteBulkheadOkTest.java | 3 +-
.../resilience4j/ResilienceRouteFallbackTest.java | 3 +-
.../resilience4j/ResilienceRouteOkTest.java | 3 +-
.../resilience4j/ResilienceRouteRejectedTest.java | 3 +-
.../SpringResilienceRouteFallbackTest.java | 3 +-
.../resilience4j/SpringResilienceRouteOkTest.java | 3 +-
.../RobotFrameworkCamelUtilsTest.java | 2 +-
.../RobotFrameworkComponentTest.java | 10 +-
.../rss/RssMultipleEndpointsIssueTest.java | 2 +-
.../sap/netweaver/NetWeaverFlightDataTest.java | 5 +-
.../netweaver/NetWeaverFlightDataVelocityTest.java | 3 +-
.../camel/builder/saxon/SaxonXPathSplitTest.java | 3 +-
.../apache/camel/builder/saxon/SaxonXPathTest.java | 3 +-
.../saxon/SpringXQueryTransformIssueTest.java | 3 +-
.../builder/saxon/XQueryRecipientListTest.java | 4 +-
.../camel/builder/saxon/XQueryResourceTest.java | 3 +-
.../builder/saxon/XQueryTransformIssueTest.java | 3 +-
.../component/xquery/SoapPayloadBeanTest.java | 2 +-
.../component/xquery/XQueryConcurrencyTest.java | 2 +-
.../camel/component/xquery/XQueryEndpointTest.java | 2 +-
.../camel/component/xquery/XQueryExampleTest.java | 2 +-
.../xquery/XQueryFromFileExceptionTest.java | 5 +-
.../camel/component/xquery/XQueryFromFileTest.java | 2 +-
.../xquery/XQueryLanguageFromFileTest.java | 2 +-
.../component/xquery/XQueryNullHeaderTest.java | 4 +-
.../xquery/XQueryPropogateHeadersTest.java | 6 +-
.../xquery/XQueryWithExplicitTypeTest.java | 2 +-
.../component/xquery/XQueryWithExtensionTest.java | 2 +-
.../SaxonLanguageExtensionFunctionsTest.java | 2 +-
.../xpath/XPathLanguageDefaultSettingsTest.java | 2 +-
.../camel/language/xpath/XPathLanguageTest.java | 12 +--
.../schematron/SchematronComponentTest.java | 4 +-
.../component/servlet/ServletChoiceBeanTest.java | 5 +-
.../servlet/rest/RestApiMatchUriServletTest.java | 3 +-
.../rest/RestJsonBindingInvalidDataTest.java | 3 +-
.../RestServletBindingModeAutoWithJsonTest.java | 2 +-
.../RestServletBindingModeAutoWithXmlTest.java | 2 +-
.../rest/RestServletBindingModeJsonTest.java | 4 +-
...RestServletBindingModeJsonWithContractTest.java | 2 +-
.../RestServletBindingModeOffWithContractTest.java | 2 +-
.../rest/RestServletBindingModeXmlTest.java | 4 +-
.../rest/RestServletPostJsonJaxbPojoTest.java | 2 +-
.../rest/RestServletPostJsonPojoListTest.java | 2 +-
.../servlet/rest/RestServletPostJsonPojoTest.java | 2 +-
.../rest/RestServletPostXmlJaxbPojoTest.java | 4 +-
.../servlet/rest/RestServletVerbTest.java | 6 +-
.../component/sjms/JmsSelectorOptionTest.java | 2 +-
.../component/sjms/SjmsComponentRestartTest.java | 13 +--
.../sjms/consumer/AsyncConsumerFalseTest.java | 3 +-
.../sjms/consumer/AsyncConsumerInOutTest.java | 3 +-
.../sjms/consumer/EmptyMessageBodyTest.java | 3 +-
.../consumer/InOnlyConsumerAsyncFalseTest.java | 3 +-
.../sjms/consumer/InOnlyConsumerTopicTest.java | 3 +-
.../consumer/InOnlyTopicDurableConsumerTest.java | 2 +-
.../sjms/consumer/InOutConcurrentConsumerTest.java | 2 +-
.../sjms/consumer/InOutConsumerQueueAsyncTest.java | 3 +-
.../sjms/consumer/InOutConsumerQueueTest.java | 3 +-
.../consumer/InOutConsumerTempQueueAsyncTest.java | 3 +-
.../sjms/consumer/InOutConsumerTempQueueTest.java | 3 +-
.../sjms/consumer/InOutConsumerTopicTest.java | 3 +-
.../sjms/consumer/JmsPollingConsumerTest.java | 8 +-
.../camel/component/sjms/it/AsyncJmsInOutIT.java | 2 +-
.../component/sjms/it/AsyncJmsInOutTempDestIT.java | 2 +-
.../camel/component/sjms/it/SyncJmsInOutIT.java | 2 +-
.../component/sjms/it/SyncJmsInOutTempDestIT.java | 2 +-
.../sjms/manual/ManualFromQueueManualTest.java | 3 +-
.../sjms/producer/AsyncQueueProducerTest.java | 3 +-
.../sjms/producer/AsyncTopicProducerTest.java | 3 +-
.../sjms/producer/QueueProducerQoSTest.java | 4 +-
.../camel/component/sjms/producer/SjmsToDTest.java | 3 +-
.../sjms/tx/TransactedAsyncExceptionTest.java | 2 +-
.../sjms/tx/TransactedConsumerSupport.java | 3 +-
.../sjms/tx/TransactedOnCompletionTest.java | 3 +-
.../sjms/tx/TransactedQueueInOutProducerTest.java | 3 +-
.../sjms/tx/TransactedQueueProducerTest.java | 3 +-
.../component/sjms2/Sjms2ComponentRestartTest.java | 13 +--
.../consumer/InOnlyTopicDurableConsumerTest.java | 2 +-
.../camel/component/slack/SlackConsumerTest.java | 2 +-
.../camel/component/slack/SlackProducerTest.java | 4 +-
.../smpp/integration/SmppComponentManualIT.java | 6 +-
.../integration/SmppComponentSpringManualIT.java | 6 +-
.../apache/camel/component/snmp/ProducerTest.java | 2 +-
.../dataformat/soap/SoapToSoapDontIgnoreTest.java | 2 +-
.../dataformat/soap/SoapToSoapIgnoreTest.java | 2 +-
.../soap/SoapToSoapSingleDataFormatterTest.java | 2 +-
.../camel/component/solr/MapBodyManualIT.java | 2 +-
.../integration/SplunkHECITManualTest.java | 2 +-
.../component/splunk/ConsumerStreamingTest.java | 2 +-
.../camel/component/splunk/ConsumerTest.java | 2 +-
.../camel/component/splunk/ProducerTest.java | 6 +-
.../camel/component/splunk/RawProducerTest.java | 6 +-
.../splunk/integration/NormalSearchManualTest.java | 2 +-
.../integration/RealtimeSearchManualTest.java | 2 +-
.../splunk/integration/SavedSearchManualTest.java | 2 +-
.../integration/SplunkProducerManualTest.java | 6 +-
.../SpringIntegrationOneWayConsumerTest.java | 2 +-
.../adapter/CamelTargetAdapterTest.java | 2 +-
.../spring/jdbc/JdbcSpringAnotherRouteTest.java | 2 +-
.../integration/RabbitMQConsumerIT.java | 3 +-
.../RabbitMQConsumerPooledExchangeIT.java | 5 +-
.../integration/RabbitMQConsumerQueuesIT.java | 7 +-
.../integration/RabbitMQConsumerRoutingKeyIT.java | 7 +-
.../integration/RabbitMQConsumerTopicIT.java | 7 +-
.../springrabbit/integration/RabbitMQInOutIT.java | 3 +-
.../integration/RabbitMQPollingConsumerIT.java | 6 +-
.../integration/RedisComponentSpringManualIT.java | 2 +-
.../camel/spring/SpringMDCTransactedTest.java | 2 +-
.../apache/camel/spring/issues/Camel14624Test.java | 3 +-
.../component/sql/CamelSqlEmptyResultTest.java | 2 +-
.../component/sql/SpringSqlEndpointLikeTest.java | 2 +-
.../component/sql/SpringSqlMultilineTest.java | 2 +-
.../sql/SqlConsumerDeleteBatchCompleteTest.java | 2 +-
.../component/sql/SqlConsumerDeleteFailedTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteTest.java | 2 +-
.../sql/SqlConsumerDeleteTransformTest.java | 2 +-
.../sql/SqlConsumerDynamicParameterTest.java | 2 +-
.../sql/SqlConsumerMaxMessagesPerPollTest.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectListTest.java | 2 +-
...lConsumerOutputTypeSelectListWithClassTest.java | 2 +-
.../camel/component/sql/SqlConsumerTest.java | 2 +-
.../camel/component/sql/SqlEndpointLikeTest.java | 2 +-
.../camel/component/sql/SqlEndpointTest.java | 2 +-
.../camel/component/sql/SqlPreserveHeaderTest.java | 2 +-
.../camel/component/sql/SqlProducerAndInTest.java | 6 +-
.../component/sql/SqlProducerConcurrentTest.java | 2 +-
.../component/sql/SqlProducerInMultiTest.java | 6 +-
.../camel/component/sql/SqlProducerInTest.java | 6 +-
.../camel/component/sql/SqlProducerNoopTest.java | 8 +-
.../component/sql/SqlProducerOutputHeaderTest.java | 2 +-
.../sql/SqlProducerOutputHeaderWithQueryTest.java | 2 +-
.../camel/component/sql/SqlProducerToDTest.java | 2 +-
.../component/sql/SqlProducerWhereIssueTest.java | 2 +-
.../component/sql/stored/ProducerBatchTest.java | 2 +-
.../sql/stored/ProducerBodyArrayTest.java | 2 +-
.../component/sql/stored/ProducerInOutTest.java | 2 +-
.../camel/component/sql/stored/ProducerTest.java | 2 +-
.../ProducerUseMessageBodyForTemplateTest.java | 2 +-
.../sql/stored/SqlFunctionDataSourceTest.java | 2 +-
.../sql/stored/SqlStoredDataSourceTest.java | 2 +-
.../jdbc/ClusteredJdbcAggregateRecoverTest.java | 3 +-
.../jdbc/JdbcAggregateCompletionIntervalTest.java | 2 +-
...JdbcAggregateConcurrentDifferentGroupsTest.java | 2 +-
.../jdbc/JdbcAggregateConcurrentSameGroupTest.java | 2 +-
.../JdbcAggregateForceCompletionHeaderTest.java | 9 +-
.../jdbc/JdbcAggregateLoadAndRecoverTest.java | 2 +-
.../jdbc/JdbcAggregateLoadConcurrentTest.java | 2 +-
.../aggregate/jdbc/JdbcAggregateLoadTest.java | 2 +-
...bcAggregateNotLostRemovedWhenConfirmedTest.java | 3 +-
.../aggregate/jdbc/JdbcAggregateNotLostTest.java | 3 +-
...ggregateRecoverDeadLetterChannelFailedTest.java | 3 +-
.../JdbcAggregateRecoverDeadLetterChannelTest.java | 3 +-
.../aggregate/jdbc/JdbcAggregateRecoverTest.java | 3 +-
...bcAggregateRecoverWithRedeliveryPolicyTest.java | 3 +-
.../jdbc/JdbcAggregateRecoverWithSedaTest.java | 3 +-
.../jdbc/JdbcAggregateSerializedHeadersTest.java | 2 +-
.../jdbc/JdbcAggregateStoreAsText2Test.java | 2 +-
.../jdbc/JdbcAggregateStoreAsTextTest.java | 4 +-
.../aggregate/jdbc/JdbcAggregateTest.java | 2 +-
.../JdbcAggregateTimeoutCompletionRestartTest.java | 2 +-
.../jdbc/JdbcRemoveConfirmOrderAggregateTest.java | 3 +-
...ngAggregateRecoverWithRedeliveryPolicyTest.java | 3 +-
.../aggregate/jdbc/JdbcSpringAggregateTest.java | 2 +-
.../CustomizedJdbcMessageIdRepositoryTest.java | 2 +-
.../jdbc/JdbcCachedMessageIdRepositoryTest.java | 2 +-
...JdbcMessageIdRepositoryCustomTableNameTest.java | 2 +-
.../jdbc/JdbcMessageIdRepositoryTest.java | 4 +-
.../component/ssh/SshComponentConsumerTest.java | 2 +-
.../ssh/SshComponentKnownHostEdDSATest.java | 2 +-
.../component/ssh/SshComponentKnownHostTest.java | 12 +--
.../component/ssh/SshComponentProducerTest.java | 6 +-
.../component/ssh/SshComponentSecurityTest.java | 16 ++--
.../component/stax/IssueWithWrongEncodingTest.java | 7 +-
.../xtokenizer/SplitGroupMultiXmlTokenTest.java | 2 +-
.../SplitGroupWrappedMultiXmlTokenTest.java | 2 +-
.../xtokenizer/SpringXMLTokenSplitTest.java | 2 +-
.../language/xtokenizer/XMLTokenSplitTest.java | 4 +-
.../XMLTokenizeLanguageGroupingTest.java | 16 ++--
.../XMLTokenizeLanguageStreamingFileTest.java | 3 +-
.../xtokenizer/XMLTokenizeLanguageTest.java | 16 ++--
.../XMLTokenizeWrapLanguageGroupingTest.java | 19 ++--
.../xtokenizer/XMLTokenizeWrapLanguageTest.java | 19 ++--
.../component/stream/ScanStreamDelayTest.java | 2 +-
.../camel/component/stream/ScanStreamFileTest.java | 6 +-
.../stream/ScanStreamFileWithFilterTest.java | 2 +-
.../camel/component/stream/StreamFileTest.java | 4 +-
.../stream/StreamGroupLinesLastStrategyTest.java | 2 +-
.../stream/StreamGroupLinesStrategyTest.java | 2 +-
.../component/stream/StreamGroupLinesTest.java | 2 +-
.../StringTemplateConcurrentTest.java | 3 +-
.../camel/swagger/producer/RestSwaggerGetTest.java | 3 +-
.../producer/RestSwaggerGetUriParamTest.java | 3 +-
.../component/syslog/AutomatedConversionTest.java | 2 +-
.../camel/component/syslog/MinaDataFormatTest.java | 2 +-
.../component/syslog/MinaManyUDPMessagesTest.java | 2 +-
.../component/syslog/NettyDataFormatTest.java | 4 +-
.../component/syslog/NettyManyUDPMessagesTest.java | 2 +-
.../syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../camel/component/syslog/NettyRfc5425Test.java | 2 +-
.../component/syslog/SyslogSpringMinaTest.java | 2 +-
.../component/syslog/SyslogSpringNettyTest.java | 2 +-
.../tarfile/SpringTarFileDataFormatTest.java | 14 +--
.../tarfile/SpringTarSplitterRouteTest.java | 2 +-
.../dataformat/tarfile/TarFileDataFormatTest.java | 18 ++--
.../tarfile/TarFileMultipleFilesSplitterTest.java | 2 +-
.../tarfile/TarFileSplitAndDeleteTest.java | 5 +-
.../tarfile/TarFileSplitIteratorCorruptTest.java | 3 +-
.../tarfile/TarSplitterRouteIssueTest.java | 5 +-
.../dataformat/tarfile/TarSplitterRouteTest.java | 2 +-
.../AggregationStrategyWithFilenameHeaderTest.java | 2 +-
.../AggregationStrategyWithPreservationTest.java | 2 +-
.../TarAggregationStrategyEmptyFirstFileTest.java | 2 +-
.../tarfile/TarAggregationStrategyTest.java | 2 +-
.../apache/camel/test/junit5/CamelTestSupport.java | 26 +----
.../camel/test/junit5/CamelTestSupportTest.java | 2 +-
.../test/junit5/RouteFilterPatternExcludeTest.java | 3 +-
.../RouteFilterPatternIncludeExcludeTest.java | 3 +-
.../test/junit5/RouteFilterPatternIncludeTest.java | 3 +-
.../test/junit5/patterns/AdviceWithLambdaTest.java | 3 +-
.../junit5/patterns/AdviceWithNotStartedTest.java | 3 +-
.../test/junit5/patterns/AsyncSendMockTest.java | 3 +-
.../test/junit5/patterns/DebugJUnit5Test.java | 5 +-
.../patterns/DebugNoLazyTypeConverterTest.java | 5 +-
.../camel/test/junit5/patterns/DebugTest.java | 5 +-
.../FilterCreateCamelContextPerClassTest.java | 5 +-
.../test/junit5/patterns/GetMockEndpointTest.java | 3 +-
.../patterns/IsMockEndpointsAndSkipJUnit5Test.java | 3 +-
.../junit5/patterns/IsMockEndpointsFileTest.java | 2 +-
.../junit5/patterns/IsMockEndpointsJUnit5Test.java | 3 +-
.../test/junit5/patterns/IsMockEndpointsTest.java | 3 +-
.../test/junit5/patterns/ProduceBeanTest.java | 3 +-
.../junit5/patterns/SimpleMockEndpointsTest.java | 3 +-
.../camel/test/junit5/patterns/SimpleMockTest.java | 3 +-
.../patterns/SimpleWeaveAddMockLastTest.java | 3 +-
...rridePropertiesWithPropertiesComponentTest.java | 3 +-
...nterceptSendToEndpointWithLoadbalancerTest.java | 3 +-
.../test/issues/AdviceWithOnCompletionTest.java | 3 +-
.../AdviceWithOnExceptionMultipleIssueTest.java | 7 +-
.../issues/AdviceWithOnExceptionTransacted.java | 3 +-
.../test/issues/MockEndpointsAndSkipTest.java | 3 +-
.../camel/test/patterns/DebugSpringTest.java | 3 +-
.../camel/test/patterns/ProduceBeanTest.java | 3 +-
.../CamelSpringTestSupportActiveProfileTest.java | 3 +-
.../camel/reactive/SplitCustomThreadPoolTest.java | 3 +-
.../reactive/SplitParallelLookupVertxTest.java | 3 +-
.../apache/camel/reactive/SplitParallelTest.java | 3 +-
.../component/undertow/UndertowError500Test.java | 3 +-
.../component/undertow/UndertowHeaderTest.java | 7 +-
.../undertow/UndertowHttpProducerSessionTest.java | 7 +-
.../undertow/UndertowHttpProducerTest.java | 7 +-
.../undertow/UndertowProducerContentTypeTest.java | 3 +-
.../undertow/UndertowProducerLeakTest.java | 3 +-
.../component/undertow/UndertowProducerTest.java | 13 +--
...estUndertowHttpBindingModeAutoWithJsonTest.java | 2 +-
...RestUndertowHttpBindingModeAutoWithXmlTest.java | 2 +-
.../rest/RestUndertowHttpBindingModeJsonTest.java | 4 +-
...ndertowHttpBindingModeJsonWithContractTest.java | 2 +-
...UndertowHttpBindingModeOffWithContractTest.java | 2 +-
.../rest/RestUndertowHttpBindingModeXmlTest.java | 4 +-
.../undertow/rest/RestUndertowHttpGetCorsTest.java | 13 +--
.../rest/RestUndertowHttpGetOrderingIssueTest.java | 11 ++-
.../rest/RestUndertowHttpMultipleVerbsTest.java | 7 +-
.../rest/RestUndertowHttpPojoTypeTest.java | 10 +-
.../rest/RestUndertowHttpPostJsonJaxbPojoTest.java | 2 +-
...RestUndertowHttpPostJsonNestedPojoListTest.java | 2 +-
.../rest/RestUndertowHttpPostJsonPojoListTest.java | 2 +-
.../rest/RestUndertowHttpPostJsonPojoTest.java | 2 +-
.../rest/RestUndertowHttpPostXmlJaxbPojoTest.java | 4 +-
.../rest/RestUndertowProducerPatchTest.java | 2 +-
.../undertow/rest/RestUndertowProducerPutTest.java | 3 +-
.../rest/RestUndertowVerbEnableCorsTest.java | 6 +-
.../undertow/rest/RestUndertowVerbTest.java | 6 +-
.../rest/UndertowHttpEmptyQueryParameterTest.java | 7 +-
.../undertow/spi/ProviderWithServletTest.java | 3 +-
.../undertow/spi/ProviderWithoutServletTest.java | 3 +-
.../SecurityProviderRolesFromComponentTest.java | 3 +-
.../undertow/spi/SecurityProviderTest.java | 3 +-
.../undertow/ws/UndertowWssRouteTest.java | 3 +-
.../component/velocity/VelocityConcurrentTest.java | 3 +-
.../VelocitySomeValuesNotInExchangeTest.java | 4 +-
.../velocity/VelocitySupplementalContextTest.java | 2 +-
.../kafka/VertxKafkaConsumerSuspendResumeTest.java | 10 +-
.../component/weather/BaseWeatherConsumerIT.java | 2 +-
.../websocket/WebsocketClientCamelRouteTest.java | 3 +-
.../WebsocketSSLClientAuthRouteExampleTest.java | 3 +-
.../WebsocketSSLContextGlobalRouteExampleTest.java | 3 +-
.../WebsocketSSLContextInUriRouteExampleTest.java | 3 +-
.../websocket/WebsocketSSLRouteExampleTest.java | 3 +-
.../wordpress/WordpressPostOperationTest.java | 10 +-
.../wordpress/WordpressUserOperationTest.java | 10 +-
.../camel/component/xj/J2XInputStreamTest.java | 2 +-
.../camel/component/xj/J2XOutputBytesTest.java | 2 +-
.../camel/component/xj/J2XOutputFileTest.java | 2 +-
.../camel/component/xj/J2XOutputIdentityTest.java | 2 +-
.../camel/component/xj/J2XOutputStringTest.java | 2 +-
.../camel/component/xj/X2JInputStreamTest.java | 2 +-
.../camel/component/xj/X2JOutputBytesTest.java | 2 +-
.../camel/component/xj/X2JOutputFileTest.java | 2 +-
.../camel/component/xj/X2JOutputIdentityTest.java | 2 +-
.../camel/component/xj/X2JOutputStringTest.java | 2 +-
.../component/xmlsecurity/ECDSASignatureTest.java | 12 +--
.../xmlsecurity/SignatureAlgorithmTest.java | 36 +++----
.../xmlsecurity/SignatureDigestMethodTest.java | 24 ++---
.../xmlsecurity/SpringXmlSignatureTest.java | 2 +-
.../xmlsecurity/XAdESSignaturePropertiesTest.java | 20 ++--
.../component/xmlsecurity/XmlSignatureTest.java | 106 ++++++++++-----------
.../xmlsecurity/XMLSecurityConcurrencyTest.java | 3 +-
.../xmpp/integration/XmppProducerConcurrentIT.java | 3 +-
.../xslt/SaxonXslIncludeEmptyHrefTest.java | 2 +-
.../camel/component/xslt/SaxonXsltDTDTest.java | 2 +-
.../xslt/SaxonXsltMessageTerminateTest.java | 3 +-
.../apache/camel/component/xslt/SaxonXsltTest.java | 2 +-
.../component/xslt/XsltRouteAllowStAXTest.java | 2 +-
.../component/xslt/saxon/SAXSourceLogBodyTest.java | 3 +-
.../xslt/saxon/XsltAggregationStrategyTest.java | 4 +-
.../camel/component/xslt/saxon/XsltSaxonTest.java | 2 +-
.../dataformat/xstream/XStreamConcurrencyTest.java | 3 +-
.../xstream/XStreamDataFormatOmitFieldsTest.java | 2 +-
.../deflater/GzipDataFormatFileDeleteTest.java | 3 +-
.../GzipDataFormatFileUnmarshalDeleteTest.java | 3 +-
.../ZipDeflaterDataFormatFileDeleteTest.java | 3 +-
...pDeflaterDataFormatFileUnmarshalDeleteTest.java | 3 +-
.../zipfile/SpringZipSplitterRouteTest.java | 2 +-
.../dataformat/zipfile/ZipFileDataFormatTest.java | 20 ++--
.../zipfile/ZipFileIteratorDataFormatTest.java | 7 +-
.../zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../zipfile/ZipFileSplitAndDeleteTest.java | 5 +-
.../zipfile/ZipFileSplitIteratorCorruptTest.java | 3 +-
.../zipfile/ZipFileSplitOneFileTest.java | 3 +-
.../zipfile/ZipSplitterRouteIssueTest.java | 5 +-
.../dataformat/zipfile/ZipSplitterRouteTest.java | 2 +-
.../AggregationStrategyWithFilenameHeaderTest.java | 2 +-
.../AggregationStrategyWithPreservationTest.java | 2 +-
.../ZipAggregationStrategyEmptyFileTest.java | 2 +-
.../zipfile/ZipAggregationStrategyTest.java | 2 +-
.../SpringZooKeeperServiceCallRouteIT.java | 3 +-
.../integration/ZooKeeperServiceCallRouteIT.java | 3 +-
.../zookeeper/integration/ConsumeChildrenIT.java | 2 +-
.../zookeeper/integration/ZooKeeperProducerIT.java | 10 +-
.../component/ComponentsBuilderFactoryTest.java | 2 +-
.../camel/builder/endpoint/CustomSedaTest.java | 2 +-
.../endpoint/EndpointRoutesConfigurationTest.java | 3 +-
.../endpoint/FileAbsolutePathIssueTest.java | 2 +-
.../builder/endpoint/FileConsumeCharsetTest.java | 2 +-
.../camel/builder/endpoint/FileDelayTest.java | 2 +-
.../endpoint/LambdaEndpointRouteBuilderTest.java | 6 +-
.../endpoint/LanguageEndpointScriptRouteTest.java | 5 +-
.../endpoint/LanguageEndpointStaticTest.java | 5 +-
.../builder/endpoint/LanguageHeaderRouteTest.java | 3 +-
.../camel/builder/endpoint/LogAdvancedTest.java | 2 +-
.../camel/builder/endpoint/LogToDAdvancedTest.java | 2 +-
.../NormalizedUriPropertyPlaceholderTest.java | 2 +-
.../camel/builder/endpoint/NormalizedUriTest.java | 2 +-
.../endpoint/OptionalPropertyPlaceholderTest.java | 9 +-
.../endpoint/ProcessorDefinitionDslTest.java | 2 +-
.../builder/endpoint/PropertyPlaceholderTest.java | 9 +-
.../builder/endpoint/RawUrlWireTapDslTest.java | 2 +-
.../endpoint/SedaEnrichSimpleExpressionTest.java | 2 +-
.../SedaPollEnrichSimpleExpressionTest.java | 2 +-
.../builder/endpoint/SedaSimpleExpressionTest.java | 2 +-
.../endpoint/SedaToDSimpleExpressionTest.java | 2 +-
.../camel/builder/endpoint/TimerAdvancedTest.java | 2 +-
.../builder/endpoint/TimerNegativeDelayTest.java | 2 +-
.../io/reload/RouteWatcherReloadStrategyTest.java | 15 +--
.../camel/itest/jms2/Jms1TopicDurableTest.java | 2 +-
.../camel/itest/jms2/Jms2DeliveryDelayTest.java | 4 +-
.../camel/itest/jms2/Jms2TopicDurableTest.java | 2 +-
.../camel/itest/async/HttpAsyncCallbackTest.java | 2 +-
.../apache/camel/itest/async/HttpAsyncDslTest.java | 5 +-
.../apache/camel/itest/async/HttpAsyncTest.java | 2 +-
.../org/apache/camel/itest/async/HttpSyncTest.java | 2 +-
...ipientListInterceptSendToEndpointIssueTest.java | 3 +-
.../itest/ftp/FtpInitialConnectTimeoutTest.java | 3 +-
.../org/apache/camel/itest/ftp/FtpXQueryTest.java | 2 +-
.../itest/idempotent/IdempotentConsumerTest.java | 3 +-
.../itest/issues/AdviceWithWeaveFirstLastTest.java | 5 +-
.../itest/issues/IntercepFromAndStrategyTest.java | 2 +-
.../itest/issues/IsUseAdviceWithJUnit5Test.java | 3 +-
.../apache/camel/itest/issues/JettyHttpTest.java | 4 +-
.../camel/itest/issues/RemoveEndpointsTest.java | 2 +-
.../camel/itest/issues/RssToHttpIssueTest.java | 2 +-
.../itest/jetty/JettyConstantSetHeaderTest.java | 2 +-
.../itest/jetty/JettyFailoverRoundRobinTest.java | 5 +-
.../itest/jetty/JettyGroovySetHeaderTest.java | 2 +-
.../itest/jetty/JettySimpleSetHeaderTest.java | 2 +-
.../jetty/JettySimulateFailoverRoundRobinTest.java | 5 +-
.../jetty/JettySpringFailoverRoundRobinTest.java | 5 +-
.../itest/jms/AdviceWithTransactionIssueTest.java | 4 +-
.../itest/jms/JmsHttpPostIssueWithMockTest.java | 5 +-
.../org/apache/camel/itest/jms/JmsJaxbTest.java | 6 +-
.../apache/camel/itest/jms/JmsJettyAsyncTest.java | 3 +-
.../apache/camel/itest/jms/JmsPollEnrichTest.java | 2 +-
.../apache/camel/itest/jms/JmsValidatorTest.java | 5 +-
.../camel/itest/jms/SpringJmsValidatorTest.java | 5 +-
.../apache/camel/itest/shiro/ShiroOverJmsTest.java | 3 +-
.../FromJmsToJdbcIdempotentConsumerToJmsTest.java | 11 ++-
.../camel/itest/test/SpringDebugBeforeTest.java | 3 +-
1664 files changed, 3526 insertions(+), 2913 deletions(-)
[camel] 01/03: (chores) Inlined calls to CamelTestSupport.assertIsSatisfied()
Posted by or...@apache.org.
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 d8facdb0b14cfecbec428c23a44d240d8832d423
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Sat Oct 1 17:53:46 2022 +0200
(chores) Inlined calls to CamelTestSupport.assertIsSatisfied()
---
.../parser/java/MyLocalAddRouteBuilderTest.java | 3 +-
.../camel/parser/java/RoasterJavaDslTest.java | 3 +-
.../parser/java/RoasterJavaDslTwoRoutesTest.java | 3 +-
.../camel/parser/java/SplitTokenizeTest.java | 14 +--
...tiveMQComponentFactoryUserNamePasswordTest.java | 3 +-
.../ActiveMQComponentUserNamePasswordTest.java | 3 +-
.../activemq/ActiveMQOriginalDestinationTest.java | 2 +-
.../component/activemq/PoisonJMSPayloadTest.java | 3 +-
.../apache/camel/component/amqp/AMQPToDTest.java | 3 +-
...1DataFormatWithStreamIteratorByteArrayTest.java | 3 +-
.../ASN1DataFormatWithStreamIteratorClassTest.java | 9 +-
.../asn1/ASN1DataFormatWithStreamTest.java | 3 +-
.../asn1/SpringASN1DataFormatRouteTest.java | 3 +-
.../atlasmap/AtlasMapExtractMappingsTest.java | 4 +-
.../atlasmap/AtlasMapForceReloadTest.java | 8 +-
.../component/atlasmap/AtlasMapJavaToJsonTest.java | 2 +-
.../camel/component/atlasmap/AtlasMapJsonTest.java | 2 +-
.../component/atlasmap/AtlasMapJsonToJavaTest.java | 2 +-
.../atlasmap/AtlasMapJsonToXmlSchemaTest.java | 2 +-
.../component/atlasmap/AtlasMapMultiDocsTest.java | 8 +-
.../component/atlasmap/AtlasMapMultiNSTest.java | 2 +-
.../component/atlasmap/AtlasMapSingleDocTest.java | 2 +-
.../camel/component/atlasmap/AtlasMapTest.java | 2 +-
.../atlasmap/AtlasMapXmlToXmlDefaultNsTest.java | 2 +-
.../component/atlasmap/AtlasMapXmlToXmlTest.java | 2 +-
.../integration/producer/AtmosProducerDelTest.java | 2 +-
.../AtmosProducerPutFolderWithRemotePathTest.java | 2 +-
.../atom/AtomPollingConsumerIdleMessageTest.java | 2 +-
.../component/atom/AtomPollingUnthrottledTest.java | 2 +-
.../apache/camel/component/atom/AtomRouteTest.java | 2 +-
.../MessageWithAttachmentRedeliveryIssueTest.java | 3 +-
.../org/apache/camel/attachment/WireTapTest.java | 3 +-
.../SecretsManagerNoEnvPropertiesSourceTestIT.java | 41 ++++----
.../SecretsManagerPropertiesSourceTestIT.java | 43 +++++----
.../component/aws2/athena/AthenaComponentTest.java | 12 +--
.../camel/component/aws2/cw/CwComponentTest.java | 2 +-
.../aws2/cw/integration/CwComponentIT.java | 2 +-
.../component/aws2/ec2/EC2ComponentSpringTest.java | 3 +-
.../camel/component/aws2/ec2/EC2ProducerTest.java | 2 +-
.../component/aws2/ecs/ECS2ProducerSpringTest.java | 10 +-
.../camel/component/aws2/ecs/ECS2ProducerTest.java | 10 +-
.../component/aws2/eks/EKS2ProducerSpringTest.java | 10 +-
.../camel/component/aws2/eks/EKS2ProducerTest.java | 10 +-
.../integration/EventbridgePutRuleManualIT.java | 2 +-
.../integration/EventbridgePutRuleSqsManualIT.java | 2 +-
.../localstack/EventbridgeDeleteRuleIT.java | 2 +-
.../localstack/EventbridgeDescribeRuleIT.java | 2 +-
.../localstack/EventbridgeDisableRuleIT.java | 2 +-
.../localstack/EventbridgeEnableRuleIT.java | 2 +-
.../EventbridgeListRuleNamesByTargetIT.java | 2 +-
.../localstack/EventbridgeListRulesIT.java | 2 +-
.../localstack/EventbridgeListTargetsByRuleIT.java | 2 +-
.../localstack/EventbridgePutEventsIT.java | 2 +-
.../localstack/EventbridgePutRuleIT.java | 2 +-
.../localstack/EventbridgeRemoveTargetsIT.java | 2 +-
.../component/aws2/iam/IAMProducerSpringTest.java | 28 +++---
.../camel/component/aws2/iam/IAMProducerTest.java | 28 +++---
.../aws2/iam/integration/IAMCreateUserIT.java | 2 +-
.../aws2/iam/integration/IAMCreateUserPojoIT.java | 2 +-
.../aws2/iam/integration/IAMDeleteUserIT.java | 2 +-
.../aws2/iam/integration/IAMGetUserIT.java | 2 +-
.../aws2/iam/integration/IAMListAccessKeyIT.java | 2 +-
.../aws2/iam/integration/IAMListUserIT.java | 2 +-
.../component/aws2/kms/KMSProducerSpringTest.java | 14 +--
.../camel/component/aws2/kms/KMSProducerTest.java | 14 +--
.../aws2/kms/localstack/KmsCreateKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsDescribeKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsDisableKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsEnableKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsListKeysIT.java | 2 +-
.../kms/localstack/KmsScheduleDeleteKeyIT.java | 2 +-
.../aws2/lambda/LambdaComponentSpringTest.java | 25 ++---
.../lambda/LambdaProducerDefaultFunctionTest.java | 2 +-
.../component/aws2/lambda/LambdaProducerTest.java | 24 ++---
.../lambda/integration/LambdaCreateFunctionIT.java | 2 +-
.../lambda/integration/LambdaDeleteFunctionIT.java | 2 +-
.../lambda/integration/LambdaGetFunctionIT.java | 2 +-
.../lambda/integration/LambdaListFunctionsIT.java | 2 +-
.../lambda/integration/LambdaPublishVersionIT.java | 2 +-
.../component/aws2/mq/MQProducerSpringTest.java | 14 +--
.../camel/component/aws2/mq/MQProducerTest.java | 14 +--
.../component/aws2/msk/MSKProducerSpringTest.java | 10 +-
.../camel/component/aws2/msk/MSKProducerTest.java | 10 +-
.../aws2/s3/integration/S3ComponentManualIT.java | 4 +-
.../aws2/s3/integration/S3ConsumerIT.java | 2 +-
.../s3/integration/S3ConsumerIgnoreBodyIT.java | 2 +-
.../s3/integration/S3ConsumerIncludeBodyIT.java | 2 +-
.../aws2/s3/integration/S3ConsumerManualIT.java | 2 +-
.../s3/integration/S3CopyObjectCustomerKeyIT.java | 2 +-
.../integration/S3CopyObjectOperationManualIT.java | 2 +-
.../S3CreateDownloadLinkOperationIT.java | 2 +-
...wnloadLinkWithProvidedPresignerOperationIT.java | 2 +-
.../s3/integration/S3DeleteBucketOperationIT.java | 2 +-
.../s3/integration/S3ListObjectsOperationIT.java | 2 +-
.../integration/S3MultipartUploadOperationIT.java | 2 +-
.../S3ObjectRangeOperationManualIT.java | 2 +-
.../S3SimpleEncryptedUploadOperationIT.java | 2 +-
.../s3/integration/S3SimpleUploadOperationIT.java | 2 +-
.../s3/integration/S3StreamUploadOperationIT.java | 2 +-
.../s3/integration/S3StreamUploadTimeoutIT.java | 2 +-
.../SqsBatchConsumerConcurrentConsumersTest.java | 2 +-
.../component/aws2/sqs/SqsBatchConsumerTest.java | 2 +-
.../component/aws2/sqs/SqsComponentSpringTest.java | 8 +-
.../camel/component/aws2/sqs/SqsComponentTest.java | 4 +-
.../aws2/sqs/SqsConsumerIdleMessageTest.java | 2 +-
.../sqs/SqsDoesNotExtendMessageVisibilityTest.java | 3 +-
.../component/aws2/sqs/SqsProducerBatchTest.java | 2 +-
.../aws2/sqs/SqsProducerDeleteQueueTest.java | 2 +-
.../component/aws2/sqs/SqsProducerDeleteTest.java | 2 +-
.../aws2/sqs/SqsProducerListQueuesTest.java | 2 +-
.../component/aws2/sqs/SqsProducerPurgeTest.java | 2 +-
.../sqs/integration/SqsComponentLocalstackIT.java | 4 +-
.../SqsConsumerMessageLocalstackIT.java | 2 +-
...qsDeadletterWithClientRegistryLocalstackIT.java | 2 +-
.../SqsProducerAutoCreateQueueLocalstackIT.java | 2 +-
.../SqsProducerBatchSendFifoLocalstackIT.java | 2 +-
.../SqsProducerBatchSendLocalstackIT.java | 2 +-
...ProducerBatchSendWithSeparatorLocalstackIT.java | 2 +-
.../SqsProducerDeleteMessageLocalstackIT.java | 2 +-
.../SqsProducerSendByteArrayLocalstackIT.java | 2 +-
.../SqsProducerSendLocalstackMaxAttributesIT.java | 2 +-
.../component/aws2/sts/STS2ProducerSpringTest.java | 6 +-
.../camel/component/aws2/sts/STS2ProducerTest.java | 6 +-
.../aws2/sts/integration/StsAssumeRoleIT.java | 2 +-
.../sts/integration/StsGetFederationTokenIT.java | 2 +-
.../aws2/sts/integration/StsGetSessionTokenIT.java | 2 +-
.../translate/Translate2ProducerSpringTest.java | 6 +-
.../aws2/translate/Translate2ProducerTest.java | 6 +-
.../integration/Translate2ProducerManualIT.java | 6 +-
.../operations/KeyVaultOperationsTest.java | 2 +-
.../KeyVaultPropertiesSourceNoEnvTestIT.java | 11 ++-
.../operations/KeyVaultPropertiesSourceTestIT.java | 23 ++---
.../base64/Base64DataFormatTestBase.java | 4 +-
.../base64/Base64PropertiesFunctionTest.java | 3 +-
.../base64/SpringBase64DataFormatTestBase.java | 4 +-
.../HibernateValidationProviderResolverTest.java | 2 +-
.../classtype/BindyCsvClassTypeAsStringTest.java | 5 +-
.../bindy/classtype/BindyCsvClassTypeTest.java | 5 +-
.../csv/BindyCarQuoteAndCommaDelimiterTest.java | 4 +-
.../bindy/csv/BindyComplexRegexSeparatorTest.java | 2 +-
.../csv/BindyMarshalEndWithLineBreakTest.java | 4 +-
.../bindy/csv/BindyPatternLocaleTest.java | 6 +-
.../bindy/csv/BindyPipeDelimiterTest.java | 6 +-
.../bindy/csv/BindySimpleCsvAutospanLineTest.java | 4 +-
...CsvContainingMultiQuoteCharEscapeFalseTest.java | 4 +-
...eCsvContainingMultiQuoteCharEscapeTrueTest.java | 4 +-
.../BindySimpleCsvFunctionWithClassMethodTest.java | 2 +-
...ndySimpleCsvFunctionWithExternalMethodTest.java | 2 +-
.../csv/BindySimpleCsvRegexAutospanLineTest.java | 4 +-
.../bindy/csv/BindyTabSeparatorTest.java | 8 +-
.../bindy/csv/WickedHeaderWithCommaCsvTest.java | 4 +-
.../BindyMarshalUnmarshalWithDefaultValueTest.java | 2 +-
.../bindy/csv2/BindyMarshalUnmarshalssueTest.java | 2 +-
.../bindy/csv2/BindyMarshalWithQuoteTest.java | 2 +-
.../bindy/csv2/BindyUnmarshalCommaIssueTest.java | 8 +-
...mpleFixedLengthMarshallWithClipAndTrimTest.java | 3 +-
...BindySimpleFixedLengthMarshallWithClipTest.java | 3 +-
.../CaffeineCacheFromScratchProducerTest.java | 2 +-
.../cache/CaffeineCacheProducerCacheNameTest.java | 2 +-
...neCacheProducerMultiOperationSameCacheTest.java | 2 +-
.../caffeine/cache/CaffeineCacheProducerTest.java | 16 ++--
.../CaffeineCacheRemovalListenerProducerTest.java | 12 +--
.../cache/CaffeineSendDynamicAwareOffTest.java | 2 +-
.../cache/CaffeineSendDynamicAwareTest.java | 2 +-
...adCacheProducerMultiOperationSameCacheTest.java | 2 +-
.../loadcache/CaffeineLoadCacheProducerTest.java | 16 ++--
.../CaffeineIdempotentRepositoryTest.java | 2 +-
.../integration/CassandraComponentConsumerIT.java | 6 +-
.../CassandraComponentResumeStrategyIT.java | 2 +-
.../cbor/CBORMarshalAllowJMSTypeTest.java | 2 +-
.../component/cbor/CBORObjectListSplitTest.java | 3 +-
.../camel/component/ChatScriptComponentIT.java | 2 +-
.../component/chunk/ChunkComponentLayersTest.java | 2 +-
.../chunk/ChunkComponentNestedLayersTest.java | 2 +-
.../component/chunk/ChunkComponentNestedTest.java | 2 +-
.../chunk/ChunkComponentTemplateTest.java | 2 +-
.../camel/component/chunk/ChunkComponentTest.java | 6 +-
.../ChunkDifferentThemeFolderAndSubfolderTest.java | 2 +-
...ferentThemeFolderSubfolderAndExtensionTest.java | 2 +-
...kDifferentThemeFolderSubfolderAndLayerTest.java | 2 +-
.../chunk/ChunkDifferentThemeFolderTest.java | 2 +-
.../camel/coap/CoAPComponentTLSTestBase.java | 28 +++---
.../org/apache/camel/coap/CoAPComponentTest.java | 4 +-
.../java/org/apache/camel/coap/CoAPPingTest.java | 2 +-
.../camel/coap/CoAPRestComponentTestBase.java | 4 +-
.../org/apache/camel/coap/CoAPRestVerbTest.java | 6 +-
.../cometd/MultipCometdProducerConsumerTest.java | 3 +-
.../cloud/ConsulDefaultServiceCallRouteIT.java | 3 +-
.../cloud/SpringConsulServiceCallRouteTest.java | 3 +-
.../integration/ProduceMessagesSimpleIT.java | 2 +-
.../integration/ProduceMessagesWithAutoIDIT.java | 2 +-
.../couchbase/integration/RemoveMessagesIT.java | 2 +-
.../camel/component/crypto/ECDSASignatureTest.java | 4 +-
.../camel/component/crypto/SignatureTest.java | 34 +++----
.../converter/crypto/CryptoDataFormatTest.java | 2 +-
.../camel/converter/crypto/PGPDataFormatTest.java | 24 ++---
.../language/csimple/joor/CSimpleBeanTest.java | 3 +-
.../csimple/joor/CSimpleDecHeaderTest.java | 2 +-
.../csimple/joor/CSimpleIncHeaderTest.java | 2 +-
.../joor/CSimpleSetHeaderPredicateTest.java | 7 +-
.../camel/language/csimple/joor/CSimpleTest.java | 3 +-
.../csv/CsvMarshalPipeDelimiterSpringTest.java | 2 +-
.../csv/CsvMarshalPipeDelimiterTest.java | 2 +-
.../csv/CsvUnmarshalCommentMarkerSpringTest.java | 2 +-
.../csv/CsvUnmarshalMapLineSpringTest.java | 8 +-
.../csv/CsvUnmarshalPipeDelimiterSpringTest.java | 2 +-
.../csv/CsvUnmarshalPipeDelimiterTest.java | 4 +-
.../csv/CsvUnmarshalSkipFirstLineSpringTest.java | 6 +-
.../csv/CsvUnmarshalStreamSpringTest.java | 2 +-
.../dataformat/csv/CsvUnmarshalStreamTest.java | 4 +-
.../csv/CsvUnmarshalTabDelimiterSpringTest.java | 4 +-
.../csv/CsvUnmarshalTabDelimiterTest.java | 4 +-
...CsvUnmarshalTwoCsvDataFormatConcurrentTest.java | 2 +-
.../jaxrs/CxfRsProducerEndpointConfigurerTest.java | 5 +-
.../cxf/jaxws/CxfMultipleConsumersSupportTest.java | 3 +-
.../CxfPayLoadSoapHeaderViaCamelHeaderTest.java | 2 +-
.../cxf/jaxws/CxfProducerSessionTest.java | 7 +-
.../cxf/jaxws/CxfProducerSynchronousFalseTest.java | 3 +-
.../cxf/jaxws/CxfProducerSynchronousTest.java | 3 +-
.../cxf/jaxws/CxfRawMessageRouterTest.java | 2 +-
.../component/cxf/util/SplitterWithXqureyTest.java | 4 +-
.../camel/component/cxf/CxfOneWayRouteTest.java | 2 +-
.../cxf/spring/FileToCxfMessageDataFormatTest.java | 2 +-
.../component/cxf/transport/CamelConduitTest.java | 4 +-
.../digitalocean/DigitalOceanComponentTest.java | 2 +-
.../integration/DigitalOceanComponentIT.java | 28 +++---
.../DirectRequestReplyAndDisruptorInOnlyTest.java | 3 +-
.../disruptor/DisruptorAsyncRouteTest.java | 2 +-
.../disruptor/DisruptorBlockWhenFullTest.java | 3 +-
.../disruptor/DisruptorComplexInOutTest.java | 3 +-
.../DisruptorConcurrentConsumersNPEIssueTest.java | 4 +-
.../DisruptorConcurrentConsumersTest.java | 2 +-
.../disruptor/DisruptorConcurrentTest.java | 8 +-
.../disruptor/DisruptorFromRouteIdTest.java | 2 +-
.../disruptor/DisruptorInOnlyChainedTest.java | 3 +-
.../component/disruptor/DisruptorInOnlyTest.java | 3 +-
.../disruptor/DisruptorInOutBigChainedTest.java | 3 +-
.../disruptor/DisruptorInOutChainedTest.java | 3 +-
.../DisruptorInOutChainedWithOnCompletionTest.java | 3 +-
.../component/disruptor/DisruptorInOutTest.java | 3 +-
...sruptorInOutWithErrorDeadLetterChannelTest.java | 3 +-
.../disruptor/DisruptorInOutWithErrorTest.java | 3 +-
.../disruptor/DisruptorMultipleConsumersTest.java | 9 +-
...sruptorReconfigureWithBlockingProducerTest.java | 3 +-
.../DisruptorShouldNotUseSameThreadTest.java | 2 +-
.../component/disruptor/DisruptorTimeoutTest.java | 4 +-
.../disruptor/DisruptorUnitOfWorkTest.java | 2 +-
.../DisruptorWaitForTaskAsPropertyTest.java | 5 +-
...sruptorWaitForTaskCompleteOnCompletionTest.java | 3 +-
.../DisruptorWaitForTaskCompleteTest.java | 5 +-
.../DisruptorWaitForTaskIfReplyExpectedTest.java | 5 +-
.../DisruptorWaitForTaskNeverOnCompletionTest.java | 3 +-
.../disruptor/DisruptorWaitForTaskNeverTest.java | 5 +-
.../FileDisruptorShutdownCompleteAllTasksTest.java | 2 +-
.../vm/DisruptorVmConcurrentConsumersTest.java | 2 +-
...mDifferentOptionsOnConsumerAndProducerTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOnlyChainedTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOnlyTest.java | 3 +-
.../disruptor/vm/DisruptorVmInOutChainedTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOutTest.java | 3 +-
.../vm/DisruptorVmInOutWithErrorTest.java | 3 +-
.../vm/DisruptorVmMultipleConsumersIssueTest.java | 3 +-
.../vm/DisruptorVmShouldNotUseSameThreadTest.java | 2 +-
.../disruptor/vm/DisruptorVmSplitterTest.java | 2 +-
.../disruptor/vm/DisruptorVmUseSameQueueTest.java | 3 +-
.../vm/DisruptorVmWaitForTaskCompleteTest.java | 5 +-
.../DisruptorVmWaitForTaskIfReplyExpectedTest.java | 5 +-
.../vm/DisruptorVmWaitForTaskNewerTest.java | 5 +-
.../converter/dozer/DozerTypeConverterDTOTest.java | 2 +-
.../converter/dozer/DozerTypeConverterTest.java | 2 +-
.../SpringDozerTypeConverterConfigurationTest.java | 2 +-
.../dozer/SpringDozerTypeConverterTest.java | 2 +-
.../SpringDozerTypeConverterWithMapIdTest.java | 2 +-
.../integration/producer/DropboxProducerDelIT.java | 2 +-
.../producer/DropboxProducerMoveIT.java | 2 +-
.../producer/DropboxProducerPutSingleFileIT.java | 2 +-
.../component/ehcache/EhcacheConsumerTest.java | 2 +-
.../component/ehcache/EhcacheProducerTest.java | 20 ++--
.../EhcacheIdempotentRepositoryTest.java | 2 +-
.../component/etcd3/AggregateEtcd3ManualTest.java | 2 +-
.../component/etcd3/policy/Etcd3RoutePolicyIT.java | 4 +-
.../facebook/FacebookComponentConsumerIT.java | 2 +-
.../facebook/FacebookComponentProducerIT.java | 2 +-
.../file/watch/FileWatchComponentTest.java | 2 +-
.../flatpack/FlatpackDelimitedDataFormatTest.java | 6 +-
.../FlatpackFixedLengthDataFormatTest.java | 4 +-
...edLengthWithHeaderAndTrailerDataFormatTest.java | 2 +-
.../freemarker/FreemarkerConcurrentTest.java | 3 +-
.../FileToFtpsExplicitSSLWithClientAuthIT.java | 2 +-
.../FileToFtpsExplicitSSLWithoutClientAuthIT.java | 2 +-
.../FileToFtpsExplicitTLSWithClientAuthIT.java | 2 +-
.../FileToFtpsExplicitTLSWithoutClientAuthIT.java | 2 +-
.../FileToFtpsImplicitSSLWithClientAuthIT.java | 2 +-
.../FileToFtpsImplicitSSLWithoutClientAuthIT.java | 2 +-
.../FileToFtpsImplicitTLSWithClientAuthIT.java | 2 +-
.../FileToFtpsImplicitTLSWithoutClientAuthIT.java | 2 +-
...FtpsWithCustomKeyAndTrustStorePropertiesIT.java | 2 +-
...FileToFtpsWithCustomTrustStorePropertiesIT.java | 2 +-
.../FileToFtpsWithDefaultSettingsIPV6IT.java | 2 +-
.../FileToFtpsWithDefaultSettingsIT.java | 2 +-
.../FileToFtpsWithFtpClientConfigRefIT.java | 2 +-
.../integration/FromFilePasswordBeanRefIT.java | 2 +-
.../integration/FromFilePasswordPropertyRefIT.java | 2 +-
.../FromFilePercentSignInPasswordIT.java | 2 +-
.../FromFileToFtpDefaultRootRenameStrategyIT.java | 2 +-
.../remote/integration/FromFileToFtpDeleteIT.java | 2 +-
.../file/remote/integration/FromFileToFtpIT.java | 2 +-
.../integration/FromFileToFtpWithChmodIT.java | 2 +-
.../FromFileTransferLoggingLevelIT.java | 2 +-
.../FromFileTransferLoggingLevelVerboseIT.java | 2 +-
.../remote/integration/FromFtpAsyncProcessIT.java | 3 +-
.../integration/FromFtpKeepLastModifiedIT.java | 6 +-
.../remote/integration/FromFtpRecursiveNoopIT.java | 4 +-
.../FromFtpRecursiveNotStepwiseNoBasePathIT.java | 2 +-
.../FromFtpRemoteFileSortByExpressionIT.java | 4 +-
...mFtpRemoteFileSortByIgnoreCaseExpressionIT.java | 6 +-
.../FromFtpRemoteFileSortByNestedExpressionIT.java | 4 +-
.../FromFtpSetNamesWithMultiDirectoriesIT.java | 2 +-
.../remote/integration/FromFtpThirdPoolOkIT.java | 3 +-
.../FromQueueThenConsumeFtpToMockIT.java | 2 +-
.../remote/integration/FtpChangedReadLockIT.java | 2 +-
.../integration/FtpChangedRootDirReadLockIT.java | 2 +-
.../FtpChangedZeroLengthReadLockIT.java | 2 +-
.../integration/FtpConsumerAbsolutePathIT.java | 2 +-
.../integration/FtpConsumerAsyncStressIT.java | 2 +-
.../integration/FtpConsumerBodyAsStringIT.java | 2 +-
.../integration/FtpConsumerDisconnectIT.java | 3 +-
.../FtpConsumerDoneFileNameFixedIT.java | 5 +-
.../integration/FtpConsumerDoneFileNameIT.java | 3 +-
.../integration/FtpConsumerDualDoneFileNameIT.java | 3 +-
.../integration/FtpConsumerIPV6BodyAsStringIT.java | 2 +-
.../integration/FtpConsumerIdempotentIT.java | 4 +-
.../FtpConsumerIdempotentKeyChangedIssueIT.java | 5 +-
.../FtpConsumerIdempotentMemoryRefIT.java | 5 +-
.../integration/FtpConsumerIdempotentRefIT.java | 4 +-
...ConsumerLocalWorkDirectoryAsAbsolutePathIT.java | 2 +-
.../FtpConsumerLocalWorkDirectoryIT.java | 4 +-
.../FtpConsumerMaxMessagesPerPollIT.java | 4 +-
.../integration/FtpConsumerMoveExpressionIT.java | 2 +-
.../FtpConsumerMultipleDirectoriesIT.java | 2 +-
.../FtpConsumerNotEagerMaxMessagesPerPollIT.java | 4 +-
.../FtpConsumerPostProcessingOnDisconnectIT.java | 4 +-
.../integration/FtpConsumerRelativeFileNameIT.java | 2 +-
.../integration/FtpConsumerReplyStringIT.java | 2 +-
.../integration/FtpConsumerResumeDownloadIT.java | 2 +-
.../FtpConsumerThrowExceptionOnLoginFailedIT.java | 3 +-
.../FtpConsumerUsingFTPClientConfigIT.java | 2 +-
.../integration/FtpConsumerWithCharsetIT.java | 2 +-
.../integration/FtpConsumerWithNoFileOptionIT.java | 2 +-
.../FtpNoReconnectAttemptUnknownHostIT.java | 2 +-
.../FtpPollEnrichBridgeErrorHandlerIT.java | 3 +-
...PollEnrichConsumeWithDisconnectAndDeleteIT.java | 2 +-
.../FtpPollingConsumerIdleMessageIT.java | 2 +-
...FtpProducerAllowNullBodyFileAlreadyExistIT.java | 4 +-
.../integration/FtpProducerConcurrentIT.java | 3 +-
.../FtpProducerConnectErrorsHeaderIT.java | 2 +-
.../integration/FtpProducerFileExistAppendIT.java | 2 +-
.../FtpProducerFileExistAppendNoFileBeforeIT.java | 2 +-
.../integration/FtpProducerFileExistFailIT.java | 2 +-
.../integration/FtpProducerFileExistIgnoreIT.java | 2 +-
.../FtpProducerFileExistOverrideIT.java | 2 +-
...FtpProducerFileExistOverrideNoFileBeforeIT.java | 2 +-
.../FtpProducerJailStartingDirectoryIT.java | 4 +-
...oducerRecipientListParallelTimeoutManualIT.java | 2 +-
.../integration/FtpProducerReplyStringIT.java | 2 +-
.../integration/FtpProducerToDMoveExistingIT.java | 3 +-
.../FtpReconnectAttemptServerStoppedIT.java | 4 +-
.../FtpReconnectAttemptUnknownHostIT.java | 2 +-
.../remote/integration/FtpRecursiveDepth2IT.java | 2 +-
.../remote/integration/FtpRecursiveDepth3IT.java | 2 +-
.../remote/integration/FtpRecursiveDepthIT.java | 2 +-
.../integration/FtpShutdownCompleteAllTasksIT.java | 2 +-
.../FtpShutdownCompleteCurrentTaskOnlyIT.java | 2 +-
.../integration/FtpSimpleConsumeAbsoluteIT.java | 2 +-
...irectoryParseWithAbsoluteDepthNoStepwiseIT.java | 2 +-
.../FtpSimpleConsumeStreamingPartialReadIT.java | 2 +-
.../FtpSimpleConsumeStreamingStepwiseFalseIT.java | 2 +-
...pSimpleConsumeStreamingWithMultipleFilesIT.java | 2 +-
.../remote/integration/FtpStreamingMoveIT.java | 2 +-
.../file/remote/integration/PaddyRouteIT.java | 2 +-
.../RecipientListErrorHandlingIssueIT.java | 5 +-
.../RemoteFileProduceOverruleOnlyOnceIT.java | 2 +-
.../SftpConsumerLocalWorkDirectoryIT.java | 4 +-
...PollEnrichConsumeWithDisconnectAndDeleteIT.java | 2 +-
.../remote/manual/FtpConsumerCamelManualTest.java | 3 +-
.../FtpConsumerCamelRecursiveManualTest.java | 3 +-
...ConsumerCamelRecursiveToAbsoluteManualTest.java | 3 +-
.../FtpConsumerNotStepwiseCamelManualTest.java | 3 +-
...onsumerNotStepwiseCamelRecursiveManualTest.java | 3 +-
...StepwiseCamelRecursiveToAbsoluteManualTest.java | 3 +-
.../remote/manual/FtpConsumerScottManualTest.java | 3 +-
.../FtpConsumerScottRecursiveManualTest.java | 3 +-
.../FromSftpRecursiveNotStepwiseNoBasePathIT.java | 2 +-
.../sftp/integration/SftpChangedReadLockIT.java | 2 +-
.../sftp/integration/SftpConsumerDisconnectIT.java | 4 +-
.../integration/SftpConsumerWithCharsetIT.java | 2 +-
.../sftp/integration/SftpECKeyFileConsumeIT.java | 2 +-
.../integration/SftpEDDSAKeyFileConsumeIT.java | 2 +-
.../remote/sftp/integration/SftpKeyConsumeIT.java | 2 +-
.../sftp/integration/SftpKeyFileConsumeIT.java | 2 +-
.../sftp/integration/SftpKeyPairECConsumeIT.java | 2 +-
.../sftp/integration/SftpKeyPairRSAConsumeIT.java | 2 +-
.../SftpKeyUriConsumeFromClasspathIT.java | 2 +-
.../sftp/integration/SftpKeyUriConsumeIT.java | 2 +-
.../sftp/integration/SftpSimpleConsumeIT.java | 2 +-
.../SftpSimpleConsumeNoStartingDirIT.java | 2 +-
.../integration/SftpSimpleConsumeRecursiveIT.java | 2 +-
.../integration/SftpSimpleConsumeStreamingIT.java | 2 +-
.../SftpSimpleConsumeStreamingPartialReadIT.java | 2 +-
...pSimpleConsumeStreamingWithMultipleFilesIT.java | 2 +-
.../SftpSimpleConsumeThroughProxyIT.java | 2 +-
.../sftp/integration/SftpSimpleIPV6ConsumeIT.java | 2 +-
.../sftp/integration/SftpUseListFalseIT.java | 2 +-
.../geocoder/GeoCoderComponentAddressTest.java | 2 +-
.../geocoder/GeoCoderCurrentAddressTest.java | 2 +-
.../geocoder/GeoCoderEmptyAddressTest.java | 2 +-
.../geocoder/GeoCoderLatLngComponentTest.java | 2 +-
.../geocoder/GeoCoderNominatimAddressTest.java | 2 +-
.../component/geocoder/GeoCoderNominatimTest.java | 2 +-
...oogleCalendarStreamConsumerIntegrationTest.java | 2 +-
.../component/google/drive/FileConverterIT.java | 2 +-
.../component/google/drive/FilesConsumerIT.java | 2 +-
.../drive/GoogleDriveFilesConverterTest.java | 2 +-
.../functions/integration/GoogleCloudIT.java | 2 +-
.../google/mail/GmailUsersMessagesConsumerIT.java | 2 +-
.../GoogleMailStreamConsumerIntegrationTest.java | 2 +-
...leSecretManagerPropertiesNoEnvSourceTestIT.java | 29 +++---
.../GoogleSecretManagerPropertiesSourceTestIT.java | 31 +++---
.../SheetsStreamConsumerIntegrationTest.java | 4 +-
.../google/storage/integration/ComplexIT.java | 2 +-
.../storage/unit/ConsumerDownloadLocalTest.java | 2 +-
.../google/storage/unit/ConsumerLocalTest.java | 2 +-
.../storage/unit/ConsumerWithFilterOptionTest.java | 4 +-
.../google/storage/unit/ProducerLocalTest.java | 2 +-
.../language/groovy/GroovyInvokeMethodTest.java | 2 +-
.../camel/language/groovy/GroovyListMapTest.java | 2 +-
.../camel/language/groovy/GroovyResourceTest.java | 3 +-
.../language/groovy/GroovySetFixedHeaderTest.java | 2 +-
.../camel/language/groovy/GroovySetHeaderTest.java | 2 +-
.../language/groovy/LanguageGroovyRouteTest.java | 3 +-
.../camel/processor/groovy/GroovyFilterTest.java | 5 +-
.../groovy/GroovySetHeaderConcurrentIssueTest.java | 3 +-
.../processor/groovy/GroovySetHeaderIssueTest.java | 3 +-
.../processor/groovy/GroovySumFilterTest.java | 5 +-
.../processor/groovy/InlinedGroovyScriptTest.java | 3 +-
.../camel/component/gson/GsonConcurrentTest.java | 3 +-
.../guava/eventbus/GuavaEventBusComponentTest.java | 3 +-
.../guava/eventbus/GuavaEventBusConsumerTest.java | 11 ++-
.../GuavaEventBusConsumingDeadEventsTest.java | 5 +-
.../HashicorpVaultPropertiesSourceNoEnvTestIT.java | 43 +++++----
.../HashicorpVaultPropertiesSourceTestIT.java | 43 +++++----
...ashicorpProducerCreateMultiVersionSecretIT.java | 2 +-
.../HashicorpProducerCreateSecretIT.java | 2 +-
.../HashicorpProducerCreateSecretPOJOIT.java | 2 +-
.../HashicorpProducerDeleteSecretIT.java | 2 +-
.../operations/HashicorpProducerListSecretsIT.java | 2 +-
...ashicorpProducerReadMultiVersionedSecretIT.java | 2 +-
.../hazelcast/HazelcastQueueConsumerPollTest.java | 2 +-
.../HazelcastReplicatedmapConsumerTest.java | 2 +-
.../HazelcastSedaConcurrentConsumersTest.java | 2 +-
.../component/hazelcast/HazelcastSedaFIFOTest.java | 2 +-
.../hazelcast/HazelcastSedaInOnlyTest.java | 2 +-
.../hazelcast/HazelcastSedaInOutTest.java | 2 +-
.../hazelcast/HazelcastSedaSpringSupportTest.java | 2 +-
.../HazelcastSedaTransferExchangeTest.java | 4 +-
.../HazelcastIdempotentRepositoryTest.java | 2 +-
.../idempotent/HBaseIdempotentRepositoryIT.java | 2 +-
.../headersmap/CamelFastHeadersMapTest.java | 2 +-
.../camel/component/hl7/HL7ByteArrayRouteTest.java | 6 +-
.../camel/component/hl7/HL7DataFormatTest.java | 14 +--
.../component/hl7/HL7MLLPCodecPlainStringTest.java | 2 +-
.../hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 6 +-
.../component/hl7/HL7MLLPNettyRouteToTest.java | 3 +-
.../camel/component/hl7/HL7NettyRouteTest.java | 6 +-
.../apache/camel/component/hl7/HL7RouteTest.java | 6 +-
.../camel/component/hl7/HL7ValidateTest.java | 10 +-
.../camel/component/hl7/HL7XmlDataFormatTest.java | 4 +-
.../camel/component/hl7/MessageValidatorTest.java | 14 +--
.../camel/component/hl7/TerserExpressionTest.java | 8 +-
.../component/http/HttpProducerSessionTest.java | 7 +-
.../ignite/IgniteCacheContinuousQueryTest.java | 13 +--
.../camel/component/ignite/IgniteEventsTest.java | 5 +-
.../camel/component/iota/IOTAProducerTest.java | 6 +-
.../component/ironmq/FromQueueToQueueTest.java | 2 +-
.../component/ironmq/IronMQBatchConsumerTest.java | 2 +-
.../component/ironmq/IronMQBatchProducerTest.java | 2 +-
.../ironmq/IronMQComponentSpringTest.java | 4 +-
.../component/ironmq/IronMQComponentTest.java | 6 +-
.../ironmq/IronMQPreserveHeadersTest.java | 2 +-
.../ironmq/integrationtest/FileCopyExample.java | 3 +-
.../integrationtest/IronMQComponentManualTest.java | 2 +-
.../IronMQRackspaceComponentManualTest.java | 2 +-
.../component/jackson/JacksonConcurrentTest.java | 3 +-
.../jackson/JacksonIncludeDefaultTest.java | 2 +-
.../jackson/JacksonIncludeNotNulllTest.java | 2 +-
.../jackson/JacksonMarshalAllowJMSTypeTest.java | 2 +-
.../jackson/JacksonMarshalUnmarshalArrayTest.java | 2 +-
.../jackson/JacksonMarshalUnmarshalListTest.java | 4 +-
.../JacksonMarshalUnmarshalPojoArrayTest.java | 2 +-
...onMarshalUnmarshalTypeHeaderNotAllowedTest.java | 2 +-
.../JacksonMarshalUnmarshalTypeHeaderTest.java | 2 +-
.../camel/component/jackson/JacksonModuleTest.java | 2 +-
.../jackson/JacksonObjectListSplitTest.java | 3 +-
.../SpringJacksonMarshalUnmarshalListTest.java | 4 +-
.../jacksonxml/JacksonConcurrentTest.java | 3 +-
.../jacksonxml/JacksonEmptyElementsAsNullTest.java | 4 +-
.../jacksonxml/JacksonIncludeDefaultTest.java | 2 +-
.../jacksonxml/JacksonIncludeNotNulllTest.java | 2 +-
.../jacksonxml/JacksonMarshalAllowJMSTypeTest.java | 2 +-
.../JacksonMarshalUnmarshalListTest.java | 4 +-
...onMarshalUnmarshalTypeHeaderNotAllowedTest.java | 2 +-
.../JacksonMarshalUnmarshalTypeHeaderTest.java | 2 +-
.../component/jacksonxml/JacksonModuleTest.java | 2 +-
.../jacksonxml/JacksonObjectListSplitTest.java | 3 +-
.../SpringJacksonMarshalUnmarshalListTest.java | 4 +-
.../component/jasypt/JasyptPropertiesTest.java | 3 +-
.../SpringJasyptBridgePropertiesAutowireTest.java | 3 +-
.../jasypt/SpringJasyptBridgePropertiesTest.java | 3 +-
.../jasypt/SpringJasyptProperties2Test.java | 3 +-
.../jasypt/SpringJasyptPropertiesTest.java | 3 +-
...ncurrentJaxbDataFormatSchemaValidationTest.java | 2 +-
.../jaxb/JaxbDataFormatMultipleNamespacesTest.java | 4 +-
.../jaxb/JaxbDataFormatPartClassHeaderTest.java | 2 +-
.../jaxb/JaxbDataFormatPartClassTest.java | 2 +-
.../JaxbDataFormatSchemaValidationSpringTest.java | 4 +-
.../jaxb/JaxbDataFormatSchemaValidationTest.java | 4 +-
.../camel/example/DataFormatConcurrentTest.java | 2 +-
.../camel/example/DataFormatDataSetTest.java | 3 +-
.../ExplicitEncodingAndXMLCharFilteringTest.java | 2 +-
.../camel/example/ExplicitFileEncodingTest.java | 2 +-
.../example/JaxbConcurrentDataFormatTest.java | 3 +-
.../org/apache/camel/example/JaxbErrorLogTest.java | 3 +-
.../camel/example/RouteWithErrorHandlerTest.java | 6 +-
.../camel/jaxb/DirectBeanToBeanPersonTypeTest.java | 3 +-
...lbackTypeConverterObjectFactoryEnabledTest.java | 3 +-
...lbackTypeConverterShouldThrowExceptionTest.java | 7 +-
.../apache/camel/jaxb/JaxbDataFormatIssueTest.java | 2 +-
.../jaxb/JaxbDataFormatMustBeJAXBElementTest.java | 4 +-
.../jaxb/JaxbMarshalNamespacePrefixMapperTest.java | 2 +-
.../jaxb/TimerBeanToBeanNotificationTypeTest.java | 3 +-
.../camel/component/jbpm/JBPMComponentIT.java | 9 +-
.../camel/component/jcache/JCacheConsumerTest.java | 2 +-
.../JcloudsFileConsumerStreamCachingIssueTest.java | 3 +-
.../camel/component/jcr/JcrGetNodeByIdTest.java | 2 +-
.../camel/component/jdbc/JdbcAnotherRouteTest.java | 2 +-
.../component/jdbc/JdbcDefaultDataSourceTest.java | 2 +-
.../camel/component/jdbc/JdbcFix18157Test.java | 2 +-
.../camel/component/jdbc/JdbcFix9491Test.java | 2 +-
.../camel/component/jdbc/JdbcOptionsTest.java | 2 +-
.../component/jdbc/JdbcParameterizedQueryTest.java | 6 +-
.../jdbc/JdbcProducerConcurrenctTest.java | 2 +-
...roducerOutputTypeSelectListOutputClassTest.java | 2 +-
.../jdbc/JdbcProducerOutputTypeSelectListTest.java | 2 +-
...ProducerOutputTypeSelectOneOutputClassTest.java | 2 +-
.../jdbc/JdbcProducerOutputTypeSelectOneTest.java | 2 +-
.../camel/component/jdbc/JdbcRouteSplitTest.java | 2 +-
.../component/jdbc/JdbcSpringAnotherRouteTest.java | 2 +-
.../component/jdbc/JdbcTransformSimpleTest.java | 2 +-
.../component/jetty/ExcludeCipherSuitesTest.java | 3 +-
.../jetty/HttpEmptyQueryParameterTest.java | 5 +-
.../jetty/HttpFilterNoCamelHeadersTest.java | 3 +-
.../jetty/HttpProducerConcurrentTest.java | 3 +-
.../component/jetty/HttpProducerSOTimeoutTest.java | 4 +-
.../jetty/HttpProducerSendEmptyHeaderTest.java | 2 +-
.../jetty/HttpProducerUnsafeCharsTest.java | 2 +-
.../camel/component/jetty/HttpSendFileTest.java | 2 +-
.../jetty/HttpStreamCacheFileIssueTest.java | 3 +-
.../jetty/HttpStreamCacheFileStopIssueTest.java | 3 +-
.../camel/component/jetty/HttpToFileTest.java | 2 +-
.../camel/component/jetty/InterfacesTest.java | 5 +-
.../jetty/JettyCallHttpThenExceptionTest.java | 3 +-
.../component/jetty/JettyCamelHttpUrlCBRTest.java | 3 +-
.../jetty/JettyContentBasedRouteTest.java | 4 +-
.../jetty/JettyContinuationDisabledTest.java | 3 +-
.../camel/component/jetty/JettyEnableJmxTest.java | 2 +-
.../JettyEndpointContinuationDisabledTest.java | 3 +-
.../camel/component/jetty/JettyHandle404Test.java | 2 +-
.../component/jetty/JettyHttpContentTypeTest.java | 5 +-
.../JettyHttpGetWithParamAsExchangeHeaderTest.java | 16 ++--
.../component/jetty/JettyHttpGetWithParamTest.java | 6 +-
.../component/jetty/JettyHttpHeadersTest.java | 3 +-
.../jetty/JettyHttpMapHttpMessageHeadersTest.java | 12 +--
.../jetty/JettyLongestContextPathMatchTest.java | 15 +--
.../jetty/JettySimplifiedHandle404Test.java | 2 +-
.../component/jetty/JettySimulateInOnlyTest.java | 4 +-
.../camel/component/jetty/JettySteveIssueTest.java | 2 +-
.../component/jetty/JettyWithXPathChoiceTest.java | 4 +-
.../component/jetty/async/JettyAsyncCBRTest.java | 3 +-
.../async/JettyAsyncContinuationDisabledTest.java | 3 +-
.../async/JettyAsyncContinuationTimeoutOkTest.java | 3 +-
.../async/JettyAsyncContinuationTimeoutTest.java | 3 +-
.../jetty/async/JettyAsyncFilterTest.java | 3 +-
.../component/jetty/async/JettyAsyncTest.java | 3 +-
.../jetty/async/JettyAsyncThrottleTest.java | 3 +-
.../jetty/async/JettyAsyncTransformTest.java | 3 +-
.../jetty/async/JettyAsyncTryCatchFinallyTest.java | 3 +-
.../jetty/file/JettyFileConsumerTest.java | 3 +-
.../camel/component/jetty/manual/JettyManual.java | 2 +-
.../jetty/rest/RestBridgeEndpointTest.java | 3 +-
.../jetty/rest/RestHttpsClientAuthRouteTest.java | 2 +-
.../rest/RestJettyBindingModeAutoWithJsonTest.java | 2 +-
.../rest/RestJettyBindingModeAutoWithXmlTest.java | 2 +-
.../jetty/rest/RestJettyBindingModeJsonTest.java | 4 +-
.../RestJettyBindingModeJsonWithContractTest.java | 2 +-
.../RestJettyBindingModeOffWithContractTest.java | 2 +-
.../jetty/rest/RestJettyBindingModeXmlTest.java | 4 +-
.../component/jetty/rest/RestJettyGetCorsTest.java | 5 +-
.../jetty/rest/RestJettyPostJsonJaxbPojoTest.java | 2 +-
.../RestJettyPostJsonPojoDisableFeatureTest.java | 2 +-
.../jetty/rest/RestJettyPostJsonPojoListTest.java | 2 +-
.../jetty/rest/RestJettyPostJsonPojoTest.java | 2 +-
.../jetty/rest/RestJettyPostXmlJaxbPojoTest.java | 4 +-
.../component/jetty/rest/RestJettyVerbTest.java | 6 +-
.../jetty/rest/RestNoBridgeEndpointTest.java | 3 +-
.../rest/producer/HttpRestProducerPutTest.java | 3 +-
.../rest/producer/JettyRestProducerPutTest.java | 3 +-
.../component/jgroups/JGroupsConsumerTest.java | 4 +-
.../jms/ActiveMQOriginalDestinationTest.java | 2 +-
.../component/jms/ConsumeMessageConverterTest.java | 4 +-
.../jms/FileRouteJmsKeepLastModifiedTest.java | 3 +-
.../component/jms/FileRouteJmsPreMoveTest.java | 3 +-
.../camel/component/jms/FileRouteToJmsTest.java | 2 +-
.../component/jms/FileRouteToJmsToFileTest.java | 2 +-
.../component/jms/FromTextToBytesMessageTest.java | 6 +-
.../jms/JmsAddAndRemoveRouteManagementTest.java | 3 +-
.../jms/JmsAllowAdditionalHeadersTest.java | 3 +-
.../camel/component/jms/JmsAllowNullBodyTest.java | 7 +-
.../camel/component/jms/JmsAutoStartupTest.java | 4 +-
.../camel/component/jms/JmsClientAckTest.java | 2 +-
...sumerRestartPickupConfigurationChangesTest.java | 4 +-
.../jms/JmsCustomHeaderFilterStrategyTest.java | 2 +-
.../component/jms/JmsDeadLetterQueueTest.java | 4 +-
...msDeadLetterQueueUsingTransferExchangeTest.java | 4 +-
.../jms/JmsDefaultTaskExecutorTypeTest.java | 5 +-
.../component/jms/JmsDestinationResolverTest.java | 2 +-
.../camel/component/jms/JmsDurableTopicTest.java | 2 +-
.../jms/JmsEagerLoadingPropertiesTest.java | 2 +-
.../jms/JmsInOnlyDisableTimeToLiveTest.java | 9 +-
.../jms/JmsInOnlyIncludeSentJMSMessageIDTest.java | 2 +-
.../jms/JmsInOnlyInvalidDestinationTest.java | 3 +-
.../jms/JmsInOnlyWithReplyToAsHeaderTest.java | 3 +-
...ToDisabledButJMSReplyToHeaderPreservedTest.java | 3 +-
.../jms/JmsInOnlyWithReplyToDisabledTest.java | 3 +-
.../jms/JmsInOnlyWithReplyToHeaderTest.java | 2 +-
.../jms/JmsInOnlyWithReplyToNotPreservedTest.java | 3 +-
.../component/jms/JmsInOnlyWithReplyToTest.java | 3 +-
.../jms/JmsInOutDisableTimeToLiveTest.java | 5 +-
.../component/jms/JmsInOutNonPersistentTest.java | 3 +-
.../jms/JmsInOutTransferExchangeTest.java | 2 +-
.../jms/JmsIncludeAllJMSXPropertiesTest.java | 3 +-
.../component/jms/JmsLoadBalanceFailoverTest.java | 3 +-
...ailoverWithForceSendOriginalJmsMessageTest.java | 4 +-
...geAsOriginalMessageInDefaultUnitOfWorkTest.java | 2 +-
.../component/jms/JmsMessageBodySetNullTest.java | 9 +-
.../JmsMessageCreatedStrategyComponentTest.java | 2 +-
.../jms/JmsMessageCreatedStrategyEndpointTest.java | 2 +-
.../jms/JmsMessageIDNotOverridenAMQTest.java | 2 +-
.../camel/component/jms/JmsMessageTypeTest.java | 22 ++---
.../component/jms/JmsMultipleConsumersTest.java | 5 +-
.../JmsNotInOnlyIncludeSentJMSMessageIDTest.java | 2 +-
.../jms/JmsNotIncludeAllJMSXPropertiesTest.java | 3 +-
...OnCompletionAndInterceptAndOnExceptionTest.java | 4 +-
.../camel/component/jms/JmsOnCompletionTest.java | 4 +-
.../jms/JmsProducerWithJMSHeaderTest.java | 30 +++---
.../camel/component/jms/JmsRemoveHeaderTest.java | 2 +-
...lyProcessRepliesConcurrentUsingThreadsTest.java | 2 +-
.../jms/JmsRouteDeliveryModePreserveQoSTest.java | 16 ++--
.../jms/JmsRouteUsingDifferentHeadersTest.java | 2 +-
.../JmsRouteWithCustomListenerContainerTest.java | 2 +-
.../JmsRouteWithDefaultKeyFormatStrategyTest.java | 6 +-
.../camel/component/jms/JmsRoutingSlipTest.java | 3 +-
.../camel/component/jms/JmsSelectorOptionTest.java | 2 +-
.../apache/camel/component/jms/JmsSessionTest.java | 2 +-
...BodyNullErrorHandlerUseOriginalMessageTest.java | 3 +-
.../camel/component/jms/JmsSimpleHeaderTest.java | 6 +-
.../jms/JmsSimpleRequestLateReplyTest.java | 3 +-
.../component/jms/JmsSimpleRequestReply2Test.java | 5 +-
.../JmsSimpleRequestReplyFixedReplyQueueTest.java | 5 +-
.../jms/JmsSplitterParallelChainedTest.java | 3 +-
.../component/jms/JmsSplitterParallelTest.java | 3 +-
.../jms/JmsSpringLoadBalanceFailoverTest.java | 3 +-
.../JmsStreamMessageTypeNoStreamCachingTest.java | 3 +-
.../component/jms/JmsStreamMessageTypeTest.java | 3 +-
.../camel/component/jms/JmsSuspendResumeTest.java | 4 +-
.../jms/JmsThrottlingInflightRoutePolicyTest.java | 2 +-
.../org/apache/camel/component/jms/JmsToDTest.java | 3 +-
.../org/apache/camel/component/jms/JmsToTest.java | 3 +-
.../jms/JmsTransferExchangeFromSplitterTest.java | 2 +-
.../component/jms/JmsTransferExchangeTest.java | 4 +-
.../component/jms/JmsUseOriginalBodyTest.java | 4 +-
.../camel/component/jms/JmsXMLRouteTest.java | 18 ++--
.../camel/component/jms/JmsXPathHeaderTest.java | 7 +-
.../component/jms/ManagedJmsEndpointTest.java | 3 +-
.../component/jms/ManagedJmsEndpointTopicTest.java | 3 +-
.../component/jms/ManagedJmsSelectorTest.java | 5 +-
.../camel/component/jms/MapJmsMessageTest.java | 4 +-
.../component/jms/PayloadByteArrayJmsTest.java | 6 +-
.../component/jms/ProduceMessageConverterTest.java | 2 +-
.../jms/ReplyToDestinationSelectorNameTest.java | 2 +-
.../jms/SpringJmsRoutingSlipInOutTest.java | 3 +-
.../component/jms/SpringJmsXPathHeaderTest.java | 7 +-
.../component/jms/TwoConsumerOnSameQueueTest.java | 7 +-
.../component/jms/TwoConsumerOnSameTopicTest.java | 13 +--
.../ActiveMQConsumeWildcardQueuesTest.java | 3 +-
.../activemq/TwoEmbeddedActiveMQBrokersTest.java | 3 +-
.../jms/async/AsyncConsumerFalseTest.java | 3 +-
.../component/jms/async/AsyncConsumerTest.java | 3 +-
.../component/jms/async/AsyncJmsProducerTest.java | 3 +-
.../component/jms/bind/JmsMessageBindTest.java | 2 +-
.../component/jms/discovery/JmsDiscoveryTest.java | 2 +-
.../component/jms/issues/AdviceWithIssueTest.java | 2 +-
...cRoutersWithJMSMessageLostHeadersIssueTest.java | 5 +-
.../jms/issues/JmsAnotherCustomJMSReplyToTest.java | 2 +-
.../issues/JmsChainedEndpointDelayTimeoutTest.java | 5 +-
.../issues/JmsConcurrentConsumerInOnlyTest.java | 3 +-
.../jms/issues/JmsCustomJMSReplyToIssueTest.java | 2 +-
.../jms/issues/JmsDirectStartupOrderIssueTest.java | 3 +-
.../jms/issues/JmsGetHeaderKeyFormatIssueTest.java | 2 +-
...derKeyFormatIssueWithContentTypeHeaderTest.java | 2 +-
.../component/jms/issues/JmsInOnlyIssueTest.java | 4 +-
.../jms/issues/JmsInOnlyParameterTest.java | 5 +-
.../JmsInOutExclusiveTopicRecipientListTest.java | 3 +-
.../jms/issues/JmsInOutExclusiveTopicTest.java | 3 +-
.../issues/JmsInOutPersistentReplyQueueTest.java | 3 +-
.../jms/issues/JmsInOutRoutingSlipTest.java | 3 +-
...ransferExchangeInflightRepositoryFlushTest.java | 2 +-
.../JmsJMSReplyToEndpointUsingInOutTest.java | 2 +-
.../jms/issues/JmsLifecycleIssueTest.java | 3 +-
.../jms/issues/JmsMQSpecialHeaderTest.java | 4 +-
.../JmsMessageHeaderContentBasedRouterTest.java | 3 +-
.../component/jms/issues/JmsMutateMessageTest.java | 2 +-
.../issues/JmsMutateRemoveHeaderMessageTest.java | 2 +-
...roughtJmsKeyFormatStrategyEndUserIssueTest.java | 2 +-
...ssThroughtJmsKeyFormatStrategyEndpointTest.java | 2 +-
.../JmsPassThroughtJmsKeyFormatStrategyTest.java | 2 +-
...KeyFormatStrategyUsingJmsConfigurationTest.java | 2 +-
.../jms/issues/JmsReplyToLoopIssueTest.java | 3 +-
.../component/jms/issues/JmsResequencerTest.java | 2 +-
.../jms/issues/JmsRoutingSlipIssueTest.java | 3 +-
.../jms/issues/JmsTXForceShutdownIssueTest.java | 2 +-
.../jms/issues/JmsToFileMessageIdTest.java | 2 +-
.../jms/issues/JmsTypeConverterIssueTest.java | 2 +-
.../camel/component/jms/issues/LarsIssueTest.java | 2 +-
...TransactionErrorHandlerRedeliveryDelayTest.java | 3 +-
.../jms/tuning/PerformanceRoutePojoTest.java | 3 +-
.../component/jms/tuning/PerformanceRouteTest.java | 3 +-
.../component/jms/tx/AsyncEndpointJmsTX2Test.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXMulticastTest.java | 3 +-
.../tx/AsyncEndpointJmsTXRecipientListTest.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXRollback2Test.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXRollbackTest.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java | 3 +-
.../component/jms/tx/AsyncEndpointJmsTXTest.java | 3 +-
.../tx/AsyncEndpointJmsTXTryCatchFinallyTest.java | 3 +-
.../jms/tx/AsyncEndpointJmsTXWireTapTest.java | 3 +-
.../jms/tx/JMSTXInOutPersistentQueueTest.java | 3 +-
.../jms/tx/JMSTransactionRollbackTest.java | 3 +-
.../JMSTransactionThrottlingRoutePolicyTest.java | 2 +-
.../component/jms/tx/JMXTXUseOriginalBodyTest.java | 4 +-
...MXTXUseOriginalBodyWithDLCErrorHandlerTest.java | 6 +-
...JMXTXUseOriginalBodyWithTXErrorHandlerTest.java | 4 +-
.../jms/tx/JmsToJmsTransactedSecurityTest.java | 2 +-
.../component/jms/tx/JmsToJmsTransactedTest.java | 6 +-
.../component/jms/tx/RouteIdTransactedTest.java | 5 +-
.../jms/tx/TransactedAsyncUsingThreadsTest.java | 5 +-
.../jms/tx/TransactedOnCompletionTest.java | 3 +-
.../tx/TransactionInterceptSendToEndpointTest.java | 3 +-
...sumerObserveAttributeMatchStringDifferTest.java | 3 +-
...JmxConsumerObserveAttributeMatchStringTest.java | 3 +-
.../jmx/CamelJmxConsumerObserveAttributeTest.java | 3 +-
.../camel/component/jmx/CamelJmxConsumerTest.java | 3 +-
.../component/johnzon/JohnzonSkipNullTest.java | 2 +-
.../camel/component/jolt/JoltFirstSampleTest.java | 3 +-
.../camel/component/jooq/JooqConsumerTest.java | 4 +-
.../camel/component/jooq/JooqPlainSQLTest.java | 2 +-
.../language/joor/JoorBeanInjectTransformTest.java | 3 +-
.../camel/language/joor/JoorBeanInjectVarTest.java | 3 +-
.../apache/camel/language/joor/JoorBeanTest.java | 3 +-
.../camel/language/joor/JoorCustomAliasTest.java | 3 +-
.../camel/language/joor/JoorCustomImportsTest.java | 3 +-
.../language/joor/JoorOptionalPredicateTest.java | 3 +-
.../language/joor/JoorPreCompileFalseTest.java | 5 +-
.../camel/language/joor/JoorPredicateTest.java | 3 +-
.../language/joor/JoorStreamPredicateTest.java | 3 +-
.../language/joor/JoorTransformResourceTest.java | 3 +-
.../camel/language/joor/JoorTransformTest.java | 3 +-
.../jpa/FileConsumerJpaIdempotentTest.java | 4 +-
.../camel/processor/jpa/JpaBatchConsumerTest.java | 2 +-
.../camel/processor/jpa/JpaCronSchedulerTest.java | 2 +-
.../camel/processor/jpa/JpaFlushOnSendTest.java | 2 +-
.../processor/jpa/JpaIdempotentConsumerTest.java | 4 +-
.../camel/processor/jpa/JpaNonTXRollbackTest.java | 3 +-
.../jpa/JpaPollingConsumerLockEntityTest.java | 4 +-
.../processor/jpa/JpaPollingConsumerTest.java | 2 +-
.../camel/processor/jpa/JpaPreConsumedTest.java | 2 +-
.../processor/jpa/JpaProducerFindEntityTest.java | 3 +-
.../jpa/JpaProducerPreserveHeadersTest.java | 2 +-
.../jpa/JpaRouteConsumeLockEntityTest.java | 2 +-
.../processor/jpa/JpaRouteMaximumResultsTest.java | 2 +-
.../jpa/JpaRouteSharedEntityManagerTest.java | 4 +-
.../jpa/JpaRouteSkipLockedEntityTest.java | 2 +-
.../apache/camel/processor/jpa/JpaRouteTest.java | 2 +-
.../jpa/JpaRoutemaxMessagesPerPollTest.java | 2 +-
.../camel/processor/jpa/JpaTXRollbackTest.java | 2 +-
.../camel/processor/jpa/JpaTransactedTest.java | 3 +-
.../apache/camel/processor/jpa/JpaWireTapTest.java | 2 +-
.../jpa/MultipleJpaRouteEndpointTest.java | 2 +-
.../jq/JqExpressionFromHeaderAsStringTest.java | 3 +-
.../jq/JqExpressionFromHeaderOrPropertyTest.java | 7 +-
.../language/jq/JqExpressionFromHeaderTest.java | 7 +-
.../language/jq/JqExpressionFromPropertyTest.java | 5 +-
.../language/jq/JqExpressionHeaderFnTest.java | 3 +-
.../camel/language/jq/JqExpressionPojoTest.java | 3 +-
.../language/jq/JqExpressionPropertyFnTest.java | 3 +-
.../camel/language/jq/JqExpressionSimpleTest.java | 3 +-
.../apache/camel/language/jq/JqFilterGETest.java | 5 +-
.../org/apache/camel/language/jq/JqFilterTest.java | 3 +-
.../camel/component/scp/ScpAlgorithmsTest.java | 3 +-
.../camel/component/scp/ScpSimpleProduceTest.java | 17 ++--
.../apache/camel/component/jslt/JsltBasicTest.java | 11 ++-
.../jslt/JsltBigDecimalCustomObjectMapperTest.java | 3 +-
.../camel/component/jslt/JsltBigDecimalTest.java | 3 +-
.../camel/component/jslt/JsltFileSourceTest.java | 9 +-
.../camel/component/jslt/JsltFunctionsTest.java | 3 +-
.../camel/component/jslt/JsltObjectFilterTest.java | 3 +-
.../apache/camel/component/jslt/JsltQueryTest.java | 3 +-
.../camel/component/jslt/JsltVariablesTest.java | 5 +-
.../jsonvalidator/ValidatorInputStreamTest.java | 3 +-
.../component/jsonapi/JsonApiDataFormatTest.java | 4 +-
.../component/jsonata/JsonataFirstSampleTest.java | 3 +-
.../camel/component/jsonb/JsonbSkipNullTest.java | 2 +-
.../jsonpath/JsonPathBeanStreamCachingTest.java | 3 +-
.../JsonPathBeanSuppressExceptionsTest.java | 5 +-
.../apache/camel/jsonpath/JsonPathBeanTest.java | 7 +-
.../org/apache/camel/jsonpath/JsonPathCBRTest.java | 9 +-
.../apache/camel/jsonpath/JsonPathCharsetTest.java | 9 +-
.../jsonpath/JsonPathChoicePrimitiveTest.java | 3 +-
.../jsonpath/JsonPathExchangePropertyTest.java | 3 +-
.../camel/jsonpath/JsonPathHeaderNameTest.java | 3 +-
.../camel/jsonpath/JsonPathMapTransformTest.java | 3 +-
.../camel/jsonpath/JsonPathPojoTransformTest.java | 3 +-
.../apache/camel/jsonpath/JsonPathSourceTest.java | 7 +-
.../apache/camel/jsonpath/JsonPathSplitTest.java | 2 +-
.../JsonPathSplitWriteAsStringMapTest.java | 2 +-
...PathSplitWriteAsStringResultTypeStringTest.java | 2 +-
.../jsonpath/JsonPathSplitWriteAsStringTest.java | 2 +-
.../jsonpath/JsonPathStreamCachingCBRTest.java | 9 +-
.../camel/jsonpath/JsonPathSuppressTest.java | 5 +-
.../jsonpath/JsonPathTransformHeaderNameTest.java | 3 +-
.../JsonPathTransformONielEscapedTest.java | 3 +-
.../JsonPathTransformONielPlaceholderTest.java | 3 +-
.../camel/jsonpath/JsonPathTransformONielTest.java | 3 +-
.../jsonpath/JsonPathTransformResultTypeTest.java | 3 +-
.../camel/jsonpath/JsonPathTransformTest.java | 3 +-
.../camel/jsonpath/JsonPathWithSimpleCBRTest.java | 7 +-
.../camel/jsonpath/SpringJsonPathCBRTest.java | 7 +-
.../SpringJsonPathCustomReadMapperBeanTest.java | 2 +-
.../SpringJsonPathSplitWriteAsStringTest.java | 2 +-
.../camel/jsonpath/SpringJsonPathSuppressTest.java | 5 +-
.../SpringJsonPathTransformHeaderNameTest.java | 3 +-
.../SpringJsonPathTransformResultTypeTest.java | 3 +-
.../jsonpath/SpringJsonPathTransformTest.java | 3 +-
.../EasyJsonPathWithRootSimpleCBRTest.java | 7 +-
.../EasyJsonPathWithSimpleCBRTest.java | 7 +-
.../component/kamelet/KameletAggregateTest.java | 3 +-
.../kamelet/KameletConsumerUoWIssueTest.java | 3 +-
.../kamelet/KameletEipAggregateGroovyTest.java | 3 +-
.../kamelet/KameletEipAggregateJoorTest.java | 3 +-
.../component/kamelet/KameletEipAggregateTest.java | 3 +-
.../component/kamelet/KameletEipFilterTest.java | 3 +-
.../component/kamelet/KameletEipMulticastTest.java | 5 +-
.../camel/component/kamelet/KameletEipTest.java | 5 +-
.../kamelet/KameletLocalBeanClassFourTest.java | 3 +-
.../kamelet/KameletLocalBeanClassTest.java | 3 +-
.../kamelet/KameletLocalBeanClassThreeTest.java | 3 +-
.../kamelet/KameletLocalBeanClassTwoTest.java | 3 +-
.../kamelet/KameletLocalBeanConfigureTest.java | 5 +-
.../KameletLocalBeanGroovyExternalTest.java | 5 +-
.../kamelet/KameletLocalBeanGroovyTest.java | 3 +-
.../component/kamelet/KameletLocalBeanIoCTest.java | 5 +-
.../kamelet/KameletLocalBeanJoorExternalTest.java | 5 +-
.../kamelet/KameletLocalBeanLanguageTest.java | 5 +-
.../kamelet/KameletLocalBeanSupplierTest.java | 3 +-
.../component/kamelet/KameletLocalBeanTest.java | 5 +-
.../kamelet/KameletLocalBeanTypeTest.java | 3 +-
.../component/kamelet/KameletLocationTest.java | 5 +-
.../kamelet/KameletRecipientListTest.java | 3 +-
.../camel/component/kamelet/KameletToDTest.java | 3 +-
.../component/kamelet/KameletUoWIssueTest.java | 3 +-
.../component/kamelet/KameletWireTapTest.java | 3 +-
.../kamelet/TemplatedRouteKameletTest.java | 3 +-
.../cloud/ServiceCallClientRouteManualTest.java | 3 +-
.../ServiceCallEnvironmentRouteManualTest.java | 3 +-
.../SpringServiceCallClientRouteManualTest.java | 3 +-
.../cloud/SpringServiceCallDnsRouteManualTest.java | 3 +-
...pringServiceCallEnvironmentRouteManualTest.java | 3 +-
...elDBAggregateConcurrentDifferentGroupsTest.java | 2 +-
.../LevelDBAggregateConcurrentSameGroupTest.java | 2 +-
.../LevelDBAggregateForceCompletionHeaderTest.java | 9 +-
.../LevelDBAggregateLoadAndRecoverTest.java | 2 +-
.../LevelDBAggregateLoadConcurrentTest.java | 2 +-
.../leveldb/LevelDBAggregateLoadTest.java | 2 +-
...velDBAggregateRecoverDeadLetterChannelTest.java | 3 +-
.../LevelDBAggregateSerializedHeadersTest.java | 2 +-
...velDBAggregateTimeoutCompletionRestartTest.java | 2 +-
.../mail/AdditionalMailPropertiesTest.java | 2 +-
.../camel/component/mail/FromFileSendMailTest.java | 2 +-
.../component/mail/MailBatchConsumerTest.java | 2 +-
.../mail/MailConsumerIdleMessageTest.java | 2 +-
.../camel/component/mail/MailConvertersTest.java | 10 +-
.../camel/component/mail/MailCopyToTest.java | 2 +-
.../camel/component/mail/MailDisconnectTest.java | 2 +-
.../mail/MailDoNotDeleteIfProcessFailsTest.java | 3 +-
...IdempotentRepositoryDuplicateNotRemoveTest.java | 2 +-
.../MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../mail/MailIdempotentRepositoryTest.java | 2 +-
.../component/mail/MailMaxMessagesPerPollTest.java | 4 +-
.../camel/component/mail/MailMoveToTest.java | 4 +-
.../component/mail/MailMultipleRecipientsTest.java | 4 +-
.../mail/MailNameAndEmailInRecipientTest.java | 2 +-
.../component/mail/MailPostProcessActionTest.java | 2 +-
.../component/mail/MailProducerConcurrentTest.java | 3 +-
.../camel/component/mail/MailProducerTest.java | 5 +-
.../component/mail/MailSearchTermNotSpamTest.java | 2 +-
.../camel/component/mail/MailSearchTermTest.java | 2 +-
.../MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../mail/MailSearchTermUriConfigTest.java | 2 +-
.../mail/MailShutdownCompleteAllTasksTest.java | 2 +-
.../MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../camel/component/mail/MailSortTermTest.java | 2 +-
.../component/mail/MailSortTermThreeTest.java | 2 +-
.../camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../camel/component/mail/RawMailMessageTest.java | 6 +-
.../component/mapstruct/CamelVehicleToCarTest.java | 3 +-
.../mapstruct/ComponentVehicleToCarTest.java | 5 +-
.../metrics/MetricsComponentRouteTest.java | 6 +-
.../ExceptionRouteMetricsMessageHistoryTest.java | 3 +-
.../messagehistory/ManagedMessageHistoryTest.java | 5 +-
.../messagehistory/MetricsMessageHistoryTest.java | 3 +-
.../SpringMetricsMessageHistoryTest.java | 3 +-
.../routepolicy/ManagedMetricsRoutePolicyTest.java | 3 +-
.../MetricsRoutePolicyMulticastSubRouteTest.java | 3 +-
.../MetricsRoutePolicySubRouteTest.java | 3 +-
.../routepolicy/MetricsRoutePolicyTest.java | 3 +-
.../micrometer/MicrometerComponentRouteTest.java | 4 +-
...ExceptionRouteMicrometerMessageHistoryTest.java | 3 +-
.../messagehistory/ManagedMessageHistoryTest.java | 3 +-
.../MicrometerMessageHistoryTest.java | 3 +-
.../SpringMicrometerMessageHistoryTest.java | 3 +-
.../ManagedMicrometerRoutePolicyTest.java | 3 +-
.../MicrometerRoutePolicyExchangeStatusTest.java | 2 +-
...MicrometerRoutePolicyMulticastSubRouteTest.java | 3 +-
.../MicrometerRoutePolicySubRouteTest.java | 3 +-
.../routepolicy/MicrometerRoutePolicyTest.java | 2 +-
.../CamelMicroProfilePropertiesSourceTest.java | 3 +-
.../FaultToleranceInheritErrorHandlerTest.java | 3 +-
.../FaultToleranceManagementTest.java | 3 +-
...tToleranceRefConfigurationNoReflectionTest.java | 3 +-
.../FaultToleranceRefConfigurationTest.java | 3 +-
.../FaultToleranceRouteBulkheadFallbackTest.java | 3 +-
.../FaultToleranceRouteBulkheadOkTest.java | 3 +-
.../FaultToleranceRouteFallbackTest.java | 3 +-
.../faulttolerance/FaultToleranceRouteOkTest.java | 3 +-
.../FaultToleranceRouteRejectedTest.java | 3 +-
.../SpringFaultToleranceRouteFallbackTest.java | 3 +-
.../SpringFaultToleranceRouteOkTest.java | 3 +-
...eMetricsExceptionInRouteMessageHistoryTest.java | 3 +-
.../MicroProfileMetricsMessageHistoryTest.java | 3 +-
...ileMetricsRoutePolicyMulticastSubRouteTest.java | 3 +-
...MicroProfileMetricsRoutePolicySubRouteTest.java | 3 +-
.../policy/MicroProfileMetricsRoutePolicyTest.java | 2 +-
.../milo/MonitorItemMultiConnectionsCertTest.java | 2 +-
.../milo/MonitorItemMultiConnectionsTest.java | 2 +-
.../camel/component/milo/WriteClientTest.java | 6 +-
.../camel/component/mina/MessageIOSessionTest.java | 4 +-
.../camel/component/mina/MinaConsumerTest.java | 2 +-
.../camel/component/mina/MinaCustomCodecTest.java | 2 +-
.../camel/component/mina/MinaEncodingTest.java | 10 +-
.../camel/component/mina/MinaFileTcpTest.java | 2 +-
.../camel/component/mina/MinaFileUdpTest.java | 2 +-
.../camel/component/mina/MinaFiltersTest.java | 2 +-
.../camel/component/mina/MinaInOnlyRouteTest.java | 2 +-
.../camel/component/mina/MinaInOutRouteTest.java | 2 +-
.../mina/MinaInOutRouteTextLineDelimiterTest.java | 2 +-
.../mina/MinaProducerAnotherConcurrentTest.java | 3 +-
.../component/mina/MinaProducerConcurrentTest.java | 3 +-
.../mina/MinaProducerShutdownMockTest.java | 2 +-
.../component/mina/MinaSpringMinaEndpointTest.java | 2 +-
.../mina/MinaSpringMinaEndpointUDPTest.java | 2 +-
.../component/mina/MinaSpringMultipleUDPTest.java | 2 +-
.../mina/MinaSslContextParametersTcpTest.java | 2 +-
.../mina/MinaSslContextParametersUdpTest.java | 2 +-
.../mina/MinaSslContextParametersVmTest.java | 2 +-
.../MinaSslGlobalContextParametersTcpTest.java | 2 +-
.../apache/camel/component/mina/MinaTcpTest.java | 4 +-
.../mina/MinaTcpTextlineDelimiterTest.java | 2 +-
.../mina/MinaTcpTextlineProtocolTest.java | 2 +-
.../component/mina/MinaUdpConcurrentTest.java | 2 +-
.../apache/camel/component/mina/MinaUdpTest.java | 2 +-
.../component/mina/MinaUdpUsingTemplateTest.java | 6 +-
.../component/mina/MinaVMCustomCodecTest.java | 2 +-
.../camel/component/mina/MinaVMFileTcpTest.java | 2 +-
.../component/mina/MinaVMTextlineProtocolTest.java | 2 +-
.../apache/camel/component/mina/MinaVmTest.java | 2 +-
.../minio/integration/MinioComponentIT.java | 4 +-
.../minio/integration/MinioConsumerIT.java | 2 +-
.../integration/MinioCopyObjectOperationIT.java | 2 +-
.../integration/MinioDeleteBucketOperationIT.java | 2 +-
.../integration/MinioListObjectsOperationIT.java | 2 +-
.../integration/MinioObjectRangeOperationIT.java | 2 +-
...cpServerConsumerAcknowledgementTestSupport.java | 4 +-
.../component/mustache/MustacheComponentTest.java | 12 +--
.../apache/camel/language/mvel/MvelFilterTest.java | 3 +-
.../camel/language/mvel/MvelResourceTest.java | 3 +-
.../mybatis/MyBatisBatchConsumerTest.java | 2 +-
.../mybatis/MyBatisConsumerIdleMessageTest.java | 2 +-
.../component/mybatis/MyBatisDeleteListTest.java | 4 +-
.../camel/component/mybatis/MyBatisDeleteTest.java | 4 +-
.../component/mybatis/MyBatisExecutorTypeTest.java | 2 +-
.../component/mybatis/MyBatisInsertListTest.java | 2 +-
.../camel/component/mybatis/MyBatisInsertTest.java | 4 +-
.../MyBatisInsertWithInputAndOutputHeaderTest.java | 2 +-
.../mybatis/MyBatisInsertWithInputHeaderTest.java | 2 +-
.../mybatis/MyBatisInsertWithOutputHeaderTest.java | 2 +-
.../mybatis/MyBatisInsertWithRollbackTest.java | 3 +-
.../mybatis/MyBatisPollingDelayRouteTest.java | 2 +-
.../camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../mybatis/MyBatisRouteEmptyResultSetTest.java | 2 +-
.../component/mybatis/MyBatisSelectListTest.java | 2 +-
.../mybatis/MyBatisSelectListWithSplitTest.java | 2 +-
...SelectOneExchangeInOutWithOutputHeaderTest.java | 2 +-
.../component/mybatis/MyBatisSelectOneTest.java | 4 +-
...BatisSelectOneWithInputAndOutputHeaderTest.java | 4 +-
.../MyBatisSelectOneWithInputHeaderTest.java | 4 +-
.../MyBatisSelectOneWithOutputHeaderTest.java | 2 +-
.../mybatis/MyBatisShutdownAllTasksTest.java | 2 +-
.../MyBatisShutdownCurrentTaskOnlyTest.java | 2 +-
.../component/mybatis/MyBatisUpdateListTest.java | 2 +-
.../camel/component/mybatis/MyBatisUpdateTest.java | 2 +-
.../mybatis/bean/MyBatisBeanInsertTest.java | 2 +-
.../mybatis/bean/MyBatisBeanSelectListTest.java | 2 +-
.../mybatis/bean/MyBatisBeanSelectOneTest.java | 4 +-
.../MyBatisBeanSelectOneWithInputHeaderTest.java | 4 +-
.../MyBatisBeanSelectOneWithOutputHeaderTest.java | 2 +-
.../netty/http/ManagedNettyEndpointTest.java | 3 +-
.../netty/http/NettyCamelWebsiteManualTest.java | 3 +-
.../netty/http/NettyDefaultProtocolTest.java | 3 +-
.../netty/http/NettyHttp500ErrorTest.java | 7 +-
...ettyHttp500ErrorThrowExceptionOnServerTest.java | 5 +-
...tyHttpAccessHttpRequestAndResponseBeanTest.java | 3 +-
.../http/NettyHttpAccessHttpRequestBeanTest.java | 3 +-
.../netty/http/NettyHttpAccessHttpRequestTest.java | 3 +-
.../NettyHttpBasicAuthConstraintMapperTest.java | 3 +-
...tpBasicAuthCustomSecurityAuthenticatorTest.java | 3 +-
.../netty/http/NettyHttpBasicAuthTest.java | 3 +-
.../netty/http/NettyHttpBridgeEncodedPathTest.java | 2 +-
.../netty/http/NettyHttpClientChunkedTest.java | 3 +-
.../http/NettyHttpClientExpectContinueTest.java | 3 +-
.../netty/http/NettyHttpContentTypeTest.java | 7 +-
.../http/NettyHttpEmptyQueryParameterTest.java | 5 +-
...pEndpointUriCustomHeaderFilterStrategyTest.java | 2 +-
.../NettyHttpGetWithParamAsExchangeHeaderTest.java | 16 ++--
.../netty/http/NettyHttpGetWithParamTest.java | 4 +-
.../netty/http/NettyHttpHandle404Test.java | 2 +-
.../NettyHttpHeaderFilterStrategyRemovalTest.java | 4 +-
.../component/netty/http/NettyHttpHeadersTest.java | 3 +-
.../netty/http/NettyHttpPostDataTest.java | 3 +-
.../netty/http/NettyHttpProducerBridgeTest.java | 4 +-
.../http/NettyHttpProducerConcurrentTest.java | 3 +-
.../netty/http/NettyHttpProducerHttpPathTest.java | 8 +-
.../netty/http/NettyHttpProducerKeepAliveTest.java | 7 +-
.../http/NettyHttpProducerSendEmptyHeaderTest.java | 2 +-
.../netty/http/NettyHttpProducerSessionTest.java | 7 +-
.../netty/http/NettyHttpProducerSimpleGetTest.java | 7 +-
.../netty/http/NettyHttpProducerSimpleTest.java | 5 +-
.../http/NettyHttpProducerWithHeaderTest.java | 5 +-
.../netty/http/NettyHttpProtocolNoSlashTest.java | 3 +-
.../netty/http/NettyHttpRawQueryTest.java | 2 +-
.../netty/http/NettyHttpRedeliveryTest.java | 3 +-
.../netty/http/NettyHttpSSLHandshakeErrorTest.java | 3 +-
.../component/netty/http/NettyHttpSSLTest.java | 3 +-
.../NettyHttpSameHostDifferentParametersTest.java | 3 +-
...ttyHttpSimpleBasicAuthConstraintMapperTest.java | 3 +-
.../netty/http/NettyHttpSimpleBasicAuthTest.java | 3 +-
.../http/NettyHttpSimplePooledExchangeTest.java | 5 +-
.../component/netty/http/NettyHttpSimpleTest.java | 3 +-
.../http/NettyHttpSimpleUriParametersTest.java | 3 +-
.../netty/http/NettyHttpTransferExceptionTest.java | 3 +-
...ttyHttpTwoRoutesBootstrapConfigurationTest.java | 3 +-
.../NettyHttpTwoRoutesMatchOnUriPrefixTest.java | 3 +-
.../http/NettyHttpTwoRoutesStopOneRouteTest.java | 5 +-
.../netty/http/NettyHttpTwoRoutesTest.java | 3 +-
.../component/netty/http/NettyMDCLoggingTest.java | 3 +-
.../netty/http/NettyMixedCaseHttpPathTest.java | 3 +-
.../netty/http/NettyRecipientListHttpBaseTest.java | 3 +-
.../netty/http/NettyRouteSimpleDynamicURITest.java | 3 +-
.../component/netty/http/NettyRouteSimpleTest.java | 3 +-
.../netty/http/NettySharedHttpServerTest.java | 3 +-
.../netty/http/NettyUseRawHttpResponseTest.java | 3 +-
.../RestNettyHttpBindingModeAutoWithJsonTest.java | 2 +-
.../RestNettyHttpBindingModeAutoWithXmlTest.java | 2 +-
.../rest/RestNettyHttpBindingModeJsonTest.java | 4 +-
...stNettyHttpBindingModeJsonWithContractTest.java | 2 +-
...estNettyHttpBindingModeOffWithContractTest.java | 2 +-
.../http/rest/RestNettyHttpBindingModeXmlTest.java | 4 +-
.../netty/http/rest/RestNettyHttpGetCorsTest.java | 5 +-
.../rest/RestNettyHttpPostJsonJaxbPojoTest.java | 2 +-
.../rest/RestNettyHttpPostJsonPojoListTest.java | 2 +-
.../http/rest/RestNettyHttpPostJsonPojoTest.java | 2 +-
.../rest/RestNettyHttpPostXmlJaxbPojoTest.java | 4 +-
.../netty/http/rest/RestNettyHttpVerbTest.java | 6 +-
.../netty/http/rest/RestNettyProducerPutTest.java | 3 +-
.../NettyConsumerClientModeReconnectTest.java | 2 +-
.../component/netty/NettyCustomCodecTest.java | 3 +-
.../netty/NettyCustomCorrelationManagerTest.java | 2 +-
.../camel/component/netty/NettyFileTcpTest.java | 2 +-
.../component/netty/NettyInOutFromSedaTest.java | 2 +-
.../component/netty/NettyManualEndpointTest.java | 3 +-
.../NettyMultipleSimultaneousClientsTest.java | 3 +-
.../netty/NettyProducerAsyncEndpointTest.java | 3 +-
.../camel/component/netty/NettyProxyTest.java | 3 +-
.../component/netty/NettyReuseChannelTest.java | 3 +-
.../netty/NettySSLClientCertHeadersTest.java | 3 +-
.../component/netty/NettySuspendResumeTest.java | 3 +-
.../NettyTextlineInOnlyNullDelimiterTest.java | 3 +-
.../NettyTextlineInOnlyPooledExchangeTest.java | 5 +-
.../component/netty/NettyTextlineInOnlyTest.java | 7 +-
.../netty/NettyTextlineInOutNonBlockingTest.java | 3 +-
.../NettyTextlineInOutSynchronousFalseTest.java | 3 +-
.../netty/NettyTextlineInOutSynchronousTest.java | 3 +-
.../component/netty/NettyTextlineInOutTest.java | 3 +-
.../netty/NettyUDPByteArrayConsumerTest.java | 2 +-
.../netty/NettyUDPLargeMessageInOnlyTest.java | 3 +-
...yUDPMessageLargerThanDefaultBufferSizeTest.java | 3 +-
.../netty/NettyUseSharedWorkerThreadPoolTest.java | 3 +-
.../SpringNettyUseSharedWorkerThreadPoolTest.java | 3 +-
.../camel/language/ognl/OgnlInvokeMethodTest.java | 2 +-
.../camel/language/ognl/OgnlResourceTest.java | 3 +-
.../camel/language/ognl/patterns/FilterTest.java | 5 +-
.../camel/openapi/producer/RestOpenApiGetTest.java | 3 +-
.../producer/RestOpenApiGetUriParamTest.java | 3 +-
.../mqtt5/PahoMqtt5OverrideTopicMqtt5Test.java | 3 +-
.../component/paho/mqtt5/PahoMqtt5ToDTest.java | 3 +-
.../component/paho/PahoOverrideTopicTest.java | 3 +-
.../apache/camel/component/paho/PahoToDTest.java | 3 +-
.../camel/component/printer/PrinterPrintTest.java | 3 +-
.../camel/component/pubnub/PubNubFireTest.java | 2 +-
.../camel/component/pubnub/PubNubPresenceTest.java | 4 +-
.../camel/component/pubnub/PubNubPublishTest.java | 4 +-
.../component/pubnub/PubNubSubscriberTest.java | 2 +-
.../pubnub/example/PubNubStateExample.java | 3 +-
.../integration/PulsarConsumerPatternInIT.java | 2 +-
.../pulsar/integration/PulsarSuspendRouteIT.java | 12 +--
.../quartz/DelegateEndpointQuartzTest.java | 2 +-
.../quartz/QuartUnderscoreTimerNameTest.java | 2 +-
...uartzAddRoutesAfterCamelContextStartedTest.java | 2 +-
.../component/quartz/QuartzAutoStartTest.java | 6 +-
.../component/quartz/QuartzCronRouteTest.java | 2 +-
.../quartz/QuartzCronTriggerRouteTest.java | 2 +-
.../quartz/QuartzCustomCalendarFireTest.java | 2 +-
.../quartz/QuartzCustomCalendarNoFireTest.java | 2 +-
.../quartz/QuartzJobRouteUnderscoreTest.java | 2 +-
.../component/quartz/QuartzManagementTest.java | 3 +-
.../quartz/QuartzManuallyTriggerJobTest.java | 2 +-
.../component/quartz/QuartzRouteRestartTest.java | 6 +-
.../component/quartz/QuartzSimpleRouteTest.java | 2 +-
.../quartz/QuartzStatefulJobRouteTest.java | 2 +-
.../component/quartz/QuartzStopRouteTest.java | 4 +-
.../component/quartz/QuartzSuspendRouteTest.java | 4 +-
.../quartz/QuartzTriggerParametersTest.java | 3 +-
.../quartz/SpringQuartzCronRouteTest.java | 2 +-
...pringQuartzPersistentStoreRestartRouteTest.java | 6 +-
.../quartz/SpringQuartzPersistentStoreTest.java | 2 +-
.../FileConsumerQuartzSchedulerRestartTest.java | 5 +-
.../quartz/FileConsumerQuartzSchedulerTest.java | 3 +-
.../RouteAutoStopFalseCronScheduledPolicyTest.java | 3 +-
.../quartz/SpringMultiplePoliciesOnRouteTest.java | 3 +-
.../integration/RabbitMQSupendResumeIT.java | 4 +-
.../rabbitmq/integration/RabbitMQToDIT.java | 3 +-
.../org/apache/camel/reactive/SimpleMockTest.java | 4 +-
.../camel/reactive/SimpleMockLookupVertxTest.java | 4 +-
.../org/apache/camel/reactive/SimpleMockTest.java | 4 +-
.../aggregate/integration/AggregateRedisIT.java | 2 +-
.../ResilienceExistingCircuitBreakerTest.java | 3 +-
.../ResilienceInheritErrorHandlerTest.java | 3 +-
.../resilience4j/ResilienceManagementTest.java | 3 +-
.../ResilienceRouteBulkheadFallbackTest.java | 3 +-
.../ResilienceRouteBulkheadOkTest.java | 3 +-
.../resilience4j/ResilienceRouteFallbackTest.java | 3 +-
.../resilience4j/ResilienceRouteOkTest.java | 3 +-
.../resilience4j/ResilienceRouteRejectedTest.java | 3 +-
.../SpringResilienceRouteFallbackTest.java | 3 +-
.../resilience4j/SpringResilienceRouteOkTest.java | 3 +-
.../RobotFrameworkCamelUtilsTest.java | 2 +-
.../RobotFrameworkComponentTest.java | 10 +-
.../rss/RssMultipleEndpointsIssueTest.java | 2 +-
.../sap/netweaver/NetWeaverFlightDataTest.java | 5 +-
.../netweaver/NetWeaverFlightDataVelocityTest.java | 3 +-
.../camel/builder/saxon/SaxonXPathSplitTest.java | 3 +-
.../apache/camel/builder/saxon/SaxonXPathTest.java | 3 +-
.../saxon/SpringXQueryTransformIssueTest.java | 3 +-
.../builder/saxon/XQueryRecipientListTest.java | 4 +-
.../camel/builder/saxon/XQueryResourceTest.java | 3 +-
.../builder/saxon/XQueryTransformIssueTest.java | 3 +-
.../component/xquery/SoapPayloadBeanTest.java | 2 +-
.../component/xquery/XQueryConcurrencyTest.java | 2 +-
.../camel/component/xquery/XQueryEndpointTest.java | 2 +-
.../camel/component/xquery/XQueryExampleTest.java | 2 +-
.../xquery/XQueryFromFileExceptionTest.java | 5 +-
.../camel/component/xquery/XQueryFromFileTest.java | 2 +-
.../xquery/XQueryLanguageFromFileTest.java | 2 +-
.../component/xquery/XQueryNullHeaderTest.java | 4 +-
.../xquery/XQueryPropogateHeadersTest.java | 6 +-
.../xquery/XQueryWithExplicitTypeTest.java | 2 +-
.../component/xquery/XQueryWithExtensionTest.java | 2 +-
.../SaxonLanguageExtensionFunctionsTest.java | 2 +-
.../xpath/XPathLanguageDefaultSettingsTest.java | 2 +-
.../camel/language/xpath/XPathLanguageTest.java | 12 +--
.../schematron/SchematronComponentTest.java | 4 +-
.../component/servlet/ServletChoiceBeanTest.java | 5 +-
.../servlet/rest/RestApiMatchUriServletTest.java | 3 +-
.../rest/RestJsonBindingInvalidDataTest.java | 3 +-
.../RestServletBindingModeAutoWithJsonTest.java | 2 +-
.../RestServletBindingModeAutoWithXmlTest.java | 2 +-
.../rest/RestServletBindingModeJsonTest.java | 4 +-
...RestServletBindingModeJsonWithContractTest.java | 2 +-
.../RestServletBindingModeOffWithContractTest.java | 2 +-
.../rest/RestServletBindingModeXmlTest.java | 4 +-
.../rest/RestServletPostJsonJaxbPojoTest.java | 2 +-
.../rest/RestServletPostJsonPojoListTest.java | 2 +-
.../servlet/rest/RestServletPostJsonPojoTest.java | 2 +-
.../rest/RestServletPostXmlJaxbPojoTest.java | 4 +-
.../servlet/rest/RestServletVerbTest.java | 6 +-
.../component/sjms/JmsSelectorOptionTest.java | 2 +-
.../component/sjms/SjmsComponentRestartTest.java | 9 +-
.../sjms/consumer/AsyncConsumerFalseTest.java | 3 +-
.../sjms/consumer/AsyncConsumerInOutTest.java | 3 +-
.../sjms/consumer/EmptyMessageBodyTest.java | 3 +-
.../consumer/InOnlyConsumerAsyncFalseTest.java | 3 +-
.../sjms/consumer/InOnlyConsumerTopicTest.java | 3 +-
.../consumer/InOnlyTopicDurableConsumerTest.java | 2 +-
.../sjms/consumer/InOutConcurrentConsumerTest.java | 2 +-
.../sjms/consumer/InOutConsumerQueueAsyncTest.java | 3 +-
.../sjms/consumer/InOutConsumerQueueTest.java | 3 +-
.../consumer/InOutConsumerTempQueueAsyncTest.java | 3 +-
.../sjms/consumer/InOutConsumerTempQueueTest.java | 3 +-
.../sjms/consumer/InOutConsumerTopicTest.java | 3 +-
.../sjms/consumer/JmsPollingConsumerTest.java | 8 +-
.../sjms/producer/AsyncQueueProducerTest.java | 3 +-
.../sjms/producer/AsyncTopicProducerTest.java | 3 +-
.../sjms/producer/QueueProducerQoSTest.java | 4 +-
.../camel/component/sjms/producer/SjmsToDTest.java | 3 +-
.../sjms/tx/TransactedOnCompletionTest.java | 3 +-
.../sjms/tx/TransactedQueueInOutProducerTest.java | 3 +-
.../sjms/tx/TransactedQueueProducerTest.java | 3 +-
.../component/sjms2/Sjms2ComponentRestartTest.java | 9 +-
.../consumer/InOnlyTopicDurableConsumerTest.java | 2 +-
.../camel/component/slack/SlackConsumerTest.java | 2 +-
.../camel/component/slack/SlackProducerTest.java | 4 +-
.../smpp/integration/SmppComponentManualIT.java | 6 +-
.../integration/SmppComponentSpringManualIT.java | 6 +-
.../dataformat/soap/SoapToSoapDontIgnoreTest.java | 2 +-
.../dataformat/soap/SoapToSoapIgnoreTest.java | 2 +-
.../soap/SoapToSoapSingleDataFormatterTest.java | 2 +-
.../camel/component/solr/MapBodyManualIT.java | 2 +-
.../integration/SplunkHECITManualTest.java | 2 +-
.../component/splunk/ConsumerStreamingTest.java | 2 +-
.../camel/component/splunk/ConsumerTest.java | 2 +-
.../camel/component/splunk/ProducerTest.java | 6 +-
.../camel/component/splunk/RawProducerTest.java | 6 +-
.../integration/RealtimeSearchManualTest.java | 2 +-
.../integration/SplunkProducerManualTest.java | 6 +-
.../SpringIntegrationOneWayConsumerTest.java | 2 +-
.../adapter/CamelTargetAdapterTest.java | 2 +-
.../spring/jdbc/JdbcSpringAnotherRouteTest.java | 2 +-
.../integration/RabbitMQPollingConsumerIT.java | 6 +-
.../integration/RedisComponentSpringManualIT.java | 2 +-
.../camel/spring/SpringMDCTransactedTest.java | 2 +-
.../apache/camel/spring/issues/Camel14624Test.java | 3 +-
.../component/sql/CamelSqlEmptyResultTest.java | 2 +-
.../component/sql/SpringSqlEndpointLikeTest.java | 2 +-
.../component/sql/SpringSqlMultilineTest.java | 2 +-
.../sql/SqlConsumerDeleteBatchCompleteTest.java | 2 +-
.../component/sql/SqlConsumerDeleteFailedTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteTest.java | 2 +-
.../sql/SqlConsumerDeleteTransformTest.java | 2 +-
.../sql/SqlConsumerDynamicParameterTest.java | 2 +-
.../sql/SqlConsumerMaxMessagesPerPollTest.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectListTest.java | 2 +-
...lConsumerOutputTypeSelectListWithClassTest.java | 2 +-
.../camel/component/sql/SqlConsumerTest.java | 2 +-
.../camel/component/sql/SqlEndpointLikeTest.java | 2 +-
.../camel/component/sql/SqlEndpointTest.java | 2 +-
.../camel/component/sql/SqlPreserveHeaderTest.java | 2 +-
.../camel/component/sql/SqlProducerAndInTest.java | 6 +-
.../component/sql/SqlProducerConcurrentTest.java | 2 +-
.../component/sql/SqlProducerInMultiTest.java | 6 +-
.../camel/component/sql/SqlProducerInTest.java | 6 +-
.../camel/component/sql/SqlProducerNoopTest.java | 8 +-
.../component/sql/SqlProducerOutputHeaderTest.java | 2 +-
.../sql/SqlProducerOutputHeaderWithQueryTest.java | 2 +-
.../camel/component/sql/SqlProducerToDTest.java | 2 +-
.../component/sql/SqlProducerWhereIssueTest.java | 2 +-
.../component/sql/stored/ProducerBatchTest.java | 2 +-
.../sql/stored/ProducerBodyArrayTest.java | 2 +-
.../component/sql/stored/ProducerInOutTest.java | 2 +-
.../camel/component/sql/stored/ProducerTest.java | 2 +-
.../ProducerUseMessageBodyForTemplateTest.java | 2 +-
.../sql/stored/SqlFunctionDataSourceTest.java | 2 +-
.../sql/stored/SqlStoredDataSourceTest.java | 2 +-
.../jdbc/JdbcAggregateCompletionIntervalTest.java | 2 +-
...JdbcAggregateConcurrentDifferentGroupsTest.java | 2 +-
.../jdbc/JdbcAggregateConcurrentSameGroupTest.java | 2 +-
.../JdbcAggregateForceCompletionHeaderTest.java | 9 +-
.../jdbc/JdbcAggregateLoadAndRecoverTest.java | 2 +-
.../jdbc/JdbcAggregateLoadConcurrentTest.java | 2 +-
.../aggregate/jdbc/JdbcAggregateLoadTest.java | 2 +-
.../JdbcAggregateRecoverDeadLetterChannelTest.java | 3 +-
.../jdbc/JdbcAggregateSerializedHeadersTest.java | 2 +-
.../jdbc/JdbcAggregateStoreAsText2Test.java | 2 +-
.../jdbc/JdbcAggregateStoreAsTextTest.java | 4 +-
.../JdbcAggregateTimeoutCompletionRestartTest.java | 2 +-
.../CustomizedJdbcMessageIdRepositoryTest.java | 2 +-
.../jdbc/JdbcCachedMessageIdRepositoryTest.java | 2 +-
...JdbcMessageIdRepositoryCustomTableNameTest.java | 2 +-
.../jdbc/JdbcMessageIdRepositoryTest.java | 4 +-
.../component/ssh/SshComponentConsumerTest.java | 2 +-
.../ssh/SshComponentKnownHostEdDSATest.java | 2 +-
.../component/ssh/SshComponentKnownHostTest.java | 12 +--
.../component/ssh/SshComponentProducerTest.java | 6 +-
.../component/ssh/SshComponentSecurityTest.java | 16 ++--
.../component/stax/IssueWithWrongEncodingTest.java | 5 +-
.../xtokenizer/SplitGroupMultiXmlTokenTest.java | 2 +-
.../SplitGroupWrappedMultiXmlTokenTest.java | 2 +-
.../xtokenizer/SpringXMLTokenSplitTest.java | 2 +-
.../language/xtokenizer/XMLTokenSplitTest.java | 4 +-
.../XMLTokenizeLanguageGroupingTest.java | 16 ++--
.../XMLTokenizeLanguageStreamingFileTest.java | 3 +-
.../xtokenizer/XMLTokenizeLanguageTest.java | 16 ++--
.../XMLTokenizeWrapLanguageGroupingTest.java | 19 ++--
.../xtokenizer/XMLTokenizeWrapLanguageTest.java | 19 ++--
.../camel/component/stream/ScanStreamFileTest.java | 6 +-
.../stream/ScanStreamFileWithFilterTest.java | 2 +-
.../camel/component/stream/StreamFileTest.java | 4 +-
.../stream/StreamGroupLinesLastStrategyTest.java | 2 +-
.../stream/StreamGroupLinesStrategyTest.java | 2 +-
.../component/stream/StreamGroupLinesTest.java | 2 +-
.../StringTemplateConcurrentTest.java | 3 +-
.../camel/swagger/producer/RestSwaggerGetTest.java | 3 +-
.../producer/RestSwaggerGetUriParamTest.java | 3 +-
.../component/syslog/AutomatedConversionTest.java | 2 +-
.../camel/component/syslog/MinaDataFormatTest.java | 2 +-
.../component/syslog/MinaManyUDPMessagesTest.java | 2 +-
.../component/syslog/NettyDataFormatTest.java | 4 +-
.../component/syslog/NettyManyUDPMessagesTest.java | 2 +-
.../syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../camel/component/syslog/NettyRfc5425Test.java | 2 +-
.../component/syslog/SyslogSpringMinaTest.java | 2 +-
.../component/syslog/SyslogSpringNettyTest.java | 2 +-
.../tarfile/SpringTarFileDataFormatTest.java | 14 +--
.../tarfile/SpringTarSplitterRouteTest.java | 2 +-
.../dataformat/tarfile/TarFileDataFormatTest.java | 18 ++--
.../tarfile/TarFileMultipleFilesSplitterTest.java | 2 +-
.../tarfile/TarFileSplitAndDeleteTest.java | 5 +-
.../tarfile/TarFileSplitIteratorCorruptTest.java | 3 +-
.../tarfile/TarSplitterRouteIssueTest.java | 5 +-
.../dataformat/tarfile/TarSplitterRouteTest.java | 2 +-
.../AggregationStrategyWithFilenameHeaderTest.java | 2 +-
.../AggregationStrategyWithPreservationTest.java | 2 +-
.../TarAggregationStrategyEmptyFirstFileTest.java | 2 +-
.../tarfile/TarAggregationStrategyTest.java | 2 +-
.../apache/camel/test/junit5/CamelTestSupport.java | 7 --
.../camel/test/junit5/CamelTestSupportTest.java | 2 +-
.../test/junit5/RouteFilterPatternExcludeTest.java | 3 +-
.../RouteFilterPatternIncludeExcludeTest.java | 3 +-
.../test/junit5/RouteFilterPatternIncludeTest.java | 3 +-
.../test/junit5/patterns/AdviceWithLambdaTest.java | 3 +-
.../junit5/patterns/AdviceWithNotStartedTest.java | 3 +-
.../test/junit5/patterns/AsyncSendMockTest.java | 3 +-
.../test/junit5/patterns/DebugJUnit5Test.java | 5 +-
.../patterns/DebugNoLazyTypeConverterTest.java | 5 +-
.../camel/test/junit5/patterns/DebugTest.java | 5 +-
.../FilterCreateCamelContextPerClassTest.java | 5 +-
.../test/junit5/patterns/GetMockEndpointTest.java | 3 +-
.../patterns/IsMockEndpointsAndSkipJUnit5Test.java | 3 +-
.../junit5/patterns/IsMockEndpointsFileTest.java | 2 +-
.../junit5/patterns/IsMockEndpointsJUnit5Test.java | 3 +-
.../test/junit5/patterns/IsMockEndpointsTest.java | 3 +-
.../test/junit5/patterns/ProduceBeanTest.java | 3 +-
.../junit5/patterns/SimpleMockEndpointsTest.java | 3 +-
.../camel/test/junit5/patterns/SimpleMockTest.java | 3 +-
.../patterns/SimpleWeaveAddMockLastTest.java | 3 +-
...rridePropertiesWithPropertiesComponentTest.java | 3 +-
...nterceptSendToEndpointWithLoadbalancerTest.java | 3 +-
.../test/issues/AdviceWithOnCompletionTest.java | 3 +-
.../AdviceWithOnExceptionMultipleIssueTest.java | 7 +-
.../issues/AdviceWithOnExceptionTransacted.java | 3 +-
.../test/issues/MockEndpointsAndSkipTest.java | 3 +-
.../camel/test/patterns/DebugSpringTest.java | 3 +-
.../camel/test/patterns/ProduceBeanTest.java | 3 +-
.../CamelSpringTestSupportActiveProfileTest.java | 3 +-
.../camel/reactive/SplitCustomThreadPoolTest.java | 3 +-
.../reactive/SplitParallelLookupVertxTest.java | 3 +-
.../apache/camel/reactive/SplitParallelTest.java | 3 +-
.../component/undertow/UndertowError500Test.java | 3 +-
.../component/undertow/UndertowHeaderTest.java | 7 +-
.../undertow/UndertowHttpProducerSessionTest.java | 7 +-
.../undertow/UndertowHttpProducerTest.java | 7 +-
.../undertow/UndertowProducerContentTypeTest.java | 3 +-
.../component/undertow/UndertowProducerTest.java | 13 +--
...estUndertowHttpBindingModeAutoWithJsonTest.java | 2 +-
...RestUndertowHttpBindingModeAutoWithXmlTest.java | 2 +-
.../rest/RestUndertowHttpBindingModeJsonTest.java | 4 +-
...ndertowHttpBindingModeJsonWithContractTest.java | 2 +-
...UndertowHttpBindingModeOffWithContractTest.java | 2 +-
.../rest/RestUndertowHttpBindingModeXmlTest.java | 4 +-
.../undertow/rest/RestUndertowHttpGetCorsTest.java | 9 +-
.../rest/RestUndertowHttpGetOrderingIssueTest.java | 7 +-
.../rest/RestUndertowHttpMultipleVerbsTest.java | 5 +-
.../rest/RestUndertowHttpPojoTypeTest.java | 10 +-
.../rest/RestUndertowHttpPostJsonJaxbPojoTest.java | 2 +-
...RestUndertowHttpPostJsonNestedPojoListTest.java | 2 +-
.../rest/RestUndertowHttpPostJsonPojoListTest.java | 2 +-
.../rest/RestUndertowHttpPostJsonPojoTest.java | 2 +-
.../rest/RestUndertowHttpPostXmlJaxbPojoTest.java | 4 +-
.../rest/RestUndertowProducerPatchTest.java | 2 +-
.../undertow/rest/RestUndertowProducerPutTest.java | 3 +-
.../rest/RestUndertowVerbEnableCorsTest.java | 6 +-
.../undertow/rest/RestUndertowVerbTest.java | 6 +-
.../rest/UndertowHttpEmptyQueryParameterTest.java | 5 +-
.../undertow/spi/ProviderWithServletTest.java | 3 +-
.../undertow/spi/ProviderWithoutServletTest.java | 3 +-
.../SecurityProviderRolesFromComponentTest.java | 3 +-
.../undertow/spi/SecurityProviderTest.java | 3 +-
.../undertow/ws/UndertowWssRouteTest.java | 3 +-
.../component/velocity/VelocityConcurrentTest.java | 3 +-
.../VelocitySomeValuesNotInExchangeTest.java | 4 +-
.../velocity/VelocitySupplementalContextTest.java | 2 +-
.../kafka/VertxKafkaConsumerSuspendResumeTest.java | 4 +-
.../websocket/WebsocketClientCamelRouteTest.java | 3 +-
.../WebsocketSSLClientAuthRouteExampleTest.java | 3 +-
.../WebsocketSSLContextGlobalRouteExampleTest.java | 3 +-
.../WebsocketSSLContextInUriRouteExampleTest.java | 3 +-
.../websocket/WebsocketSSLRouteExampleTest.java | 3 +-
.../wordpress/WordpressPostOperationTest.java | 10 +-
.../wordpress/WordpressUserOperationTest.java | 10 +-
.../camel/component/xj/J2XInputStreamTest.java | 2 +-
.../camel/component/xj/J2XOutputBytesTest.java | 2 +-
.../camel/component/xj/J2XOutputFileTest.java | 2 +-
.../camel/component/xj/J2XOutputIdentityTest.java | 2 +-
.../camel/component/xj/J2XOutputStringTest.java | 2 +-
.../camel/component/xj/X2JInputStreamTest.java | 2 +-
.../camel/component/xj/X2JOutputBytesTest.java | 2 +-
.../camel/component/xj/X2JOutputFileTest.java | 2 +-
.../camel/component/xj/X2JOutputIdentityTest.java | 2 +-
.../camel/component/xj/X2JOutputStringTest.java | 2 +-
.../component/xmlsecurity/ECDSASignatureTest.java | 12 +--
.../xmlsecurity/SignatureAlgorithmTest.java | 36 +++----
.../xmlsecurity/SignatureDigestMethodTest.java | 24 ++---
.../xmlsecurity/SpringXmlSignatureTest.java | 2 +-
.../xmlsecurity/XAdESSignaturePropertiesTest.java | 20 ++--
.../component/xmlsecurity/XmlSignatureTest.java | 106 ++++++++++-----------
.../xmlsecurity/XMLSecurityConcurrencyTest.java | 3 +-
.../xmpp/integration/XmppProducerConcurrentIT.java | 3 +-
.../xslt/SaxonXslIncludeEmptyHrefTest.java | 2 +-
.../camel/component/xslt/SaxonXsltDTDTest.java | 2 +-
.../xslt/SaxonXsltMessageTerminateTest.java | 3 +-
.../apache/camel/component/xslt/SaxonXsltTest.java | 2 +-
.../component/xslt/XsltRouteAllowStAXTest.java | 2 +-
.../component/xslt/saxon/SAXSourceLogBodyTest.java | 3 +-
.../xslt/saxon/XsltAggregationStrategyTest.java | 4 +-
.../camel/component/xslt/saxon/XsltSaxonTest.java | 2 +-
.../dataformat/xstream/XStreamConcurrencyTest.java | 3 +-
.../xstream/XStreamDataFormatOmitFieldsTest.java | 2 +-
.../deflater/GzipDataFormatFileDeleteTest.java | 3 +-
.../GzipDataFormatFileUnmarshalDeleteTest.java | 3 +-
.../ZipDeflaterDataFormatFileDeleteTest.java | 3 +-
...pDeflaterDataFormatFileUnmarshalDeleteTest.java | 3 +-
.../zipfile/SpringZipSplitterRouteTest.java | 2 +-
.../dataformat/zipfile/ZipFileDataFormatTest.java | 20 ++--
.../zipfile/ZipFileIteratorDataFormatTest.java | 5 +-
.../zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../zipfile/ZipFileSplitAndDeleteTest.java | 5 +-
.../zipfile/ZipFileSplitIteratorCorruptTest.java | 3 +-
.../zipfile/ZipFileSplitOneFileTest.java | 3 +-
.../zipfile/ZipSplitterRouteIssueTest.java | 5 +-
.../dataformat/zipfile/ZipSplitterRouteTest.java | 2 +-
.../AggregationStrategyWithFilenameHeaderTest.java | 2 +-
.../AggregationStrategyWithPreservationTest.java | 2 +-
.../ZipAggregationStrategyEmptyFileTest.java | 2 +-
.../zipfile/ZipAggregationStrategyTest.java | 2 +-
.../SpringZooKeeperServiceCallRouteIT.java | 3 +-
.../integration/ZooKeeperServiceCallRouteIT.java | 3 +-
.../zookeeper/integration/ConsumeChildrenIT.java | 2 +-
.../zookeeper/integration/ZooKeeperProducerIT.java | 10 +-
.../component/ComponentsBuilderFactoryTest.java | 2 +-
.../camel/builder/endpoint/CustomSedaTest.java | 2 +-
.../endpoint/EndpointRoutesConfigurationTest.java | 3 +-
.../endpoint/FileAbsolutePathIssueTest.java | 2 +-
.../builder/endpoint/FileConsumeCharsetTest.java | 2 +-
.../camel/builder/endpoint/FileDelayTest.java | 2 +-
.../endpoint/LambdaEndpointRouteBuilderTest.java | 6 +-
.../endpoint/LanguageEndpointScriptRouteTest.java | 5 +-
.../endpoint/LanguageEndpointStaticTest.java | 5 +-
.../builder/endpoint/LanguageHeaderRouteTest.java | 3 +-
.../camel/builder/endpoint/LogAdvancedTest.java | 2 +-
.../camel/builder/endpoint/LogToDAdvancedTest.java | 2 +-
.../NormalizedUriPropertyPlaceholderTest.java | 2 +-
.../camel/builder/endpoint/NormalizedUriTest.java | 2 +-
.../endpoint/OptionalPropertyPlaceholderTest.java | 9 +-
.../endpoint/ProcessorDefinitionDslTest.java | 2 +-
.../builder/endpoint/PropertyPlaceholderTest.java | 9 +-
.../builder/endpoint/RawUrlWireTapDslTest.java | 2 +-
.../endpoint/SedaEnrichSimpleExpressionTest.java | 2 +-
.../SedaPollEnrichSimpleExpressionTest.java | 2 +-
.../builder/endpoint/SedaSimpleExpressionTest.java | 2 +-
.../endpoint/SedaToDSimpleExpressionTest.java | 2 +-
.../camel/builder/endpoint/TimerAdvancedTest.java | 2 +-
.../builder/endpoint/TimerNegativeDelayTest.java | 2 +-
.../io/reload/RouteWatcherReloadStrategyTest.java | 11 ++-
.../camel/itest/jms2/Jms1TopicDurableTest.java | 2 +-
.../camel/itest/jms2/Jms2DeliveryDelayTest.java | 4 +-
.../camel/itest/jms2/Jms2TopicDurableTest.java | 2 +-
.../camel/itest/async/HttpAsyncCallbackTest.java | 2 +-
.../apache/camel/itest/async/HttpAsyncDslTest.java | 5 +-
.../apache/camel/itest/async/HttpAsyncTest.java | 2 +-
.../org/apache/camel/itest/async/HttpSyncTest.java | 2 +-
...ipientListInterceptSendToEndpointIssueTest.java | 3 +-
.../itest/ftp/FtpInitialConnectTimeoutTest.java | 3 +-
.../org/apache/camel/itest/ftp/FtpXQueryTest.java | 2 +-
.../itest/idempotent/IdempotentConsumerTest.java | 3 +-
.../itest/issues/AdviceWithWeaveFirstLastTest.java | 5 +-
.../itest/issues/IntercepFromAndStrategyTest.java | 2 +-
.../itest/issues/IsUseAdviceWithJUnit5Test.java | 3 +-
.../apache/camel/itest/issues/JettyHttpTest.java | 4 +-
.../camel/itest/issues/RemoveEndpointsTest.java | 2 +-
.../camel/itest/issues/RssToHttpIssueTest.java | 2 +-
.../itest/jetty/JettyConstantSetHeaderTest.java | 2 +-
.../itest/jetty/JettyFailoverRoundRobinTest.java | 3 +-
.../itest/jetty/JettyGroovySetHeaderTest.java | 2 +-
.../itest/jetty/JettySimpleSetHeaderTest.java | 2 +-
.../jetty/JettySimulateFailoverRoundRobinTest.java | 3 +-
.../jetty/JettySpringFailoverRoundRobinTest.java | 3 +-
.../itest/jms/AdviceWithTransactionIssueTest.java | 4 +-
.../itest/jms/JmsHttpPostIssueWithMockTest.java | 5 +-
.../org/apache/camel/itest/jms/JmsJaxbTest.java | 6 +-
.../apache/camel/itest/jms/JmsPollEnrichTest.java | 2 +-
.../apache/camel/itest/jms/JmsValidatorTest.java | 5 +-
.../camel/itest/jms/SpringJmsValidatorTest.java | 5 +-
.../apache/camel/itest/shiro/ShiroOverJmsTest.java | 3 +-
.../FromJmsToJdbcIdempotentConsumerToJmsTest.java | 11 ++-
.../camel/itest/test/SpringDebugBeforeTest.java | 3 +-
1552 files changed, 3241 insertions(+), 2651 deletions(-)
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
index 2eb035d01d3..b1e91a4d0be 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -48,7 +49,7 @@ public class MyLocalAddRouteBuilderTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
index 5a4712d2f22..38b0ca345a9 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.parser.java;
import java.io.File;
import java.util.List;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelNodeDetails;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -78,7 +79,7 @@ public class RoasterJavaDslTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
index 55ca20bc127..b302f384a0d 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.parser.java;
import java.io.File;
import java.util.List;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelNodeDetails;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -84,7 +85,7 @@ public class RoasterJavaDslTwoRoutesTest extends CamelTestSupport {
template.sendBody("direct:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
index 2e0f7fb73d7..31833e9a99c 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
@@ -30,7 +30,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
template.sendBody("direct:a", "Claus,James,Willem");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -40,7 +40,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
template.sendBodyAndHeader("direct:b", "Hello World", "myHeader", "Claus,James,Willem");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -50,7 +50,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
template.sendBody("direct:c", "Claus James Willem");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -60,7 +60,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
template.sendBody("direct:d", "[Claus][James][Willem]");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -71,7 +71,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
String xml = "<persons><person>Claus</person><person>James</person><person>Willem</person></persons>";
template.sendBody("direct:e", xml);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -81,7 +81,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
mock.expectedBodiesReceived("<person attr='/' />");
template.sendBody("direct:e", xml);
mock.assertIsSatisfied();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -92,7 +92,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
String xml = "<persons><person/><person name=\"Claus\"/><person>James</person><person>Willem</person></persons>";
template.sendBody("direct:f", xml);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
index f4cf3fc3dbe..d1e4f3d8552 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.activemq;
import org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,6 +39,6 @@ public class ActiveMQComponentFactoryUserNamePasswordTest extends ActiveMQSpring
template.sendBody("activemq:queue:bar", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
index 7b55c230b05..f1b3672d916 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.activemq;
import org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,6 +39,6 @@ public class ActiveMQComponentUserNamePasswordTest extends ActiveMQSpringTestSup
template.sendBody("activemq:queue:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
index 5f5fe271bf8..4c2e79a5743 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
@@ -42,7 +42,7 @@ public class ActiveMQOriginalDestinationTest extends ActiveMQTestSupport {
template.sendBody("activemq:queue:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// consume from bar
Exchange out = consumer.receive("activemq:queue:bar", 5000);
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
index 359ac8f3bf1..c4e54059e9c 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
@@ -24,6 +24,7 @@ import javax.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +63,7 @@ public class PoisonJMSPayloadTest extends ActiveMQSpringTestSupport {
boolean invoked = context.getRegistry().lookupByNameAndType("myBean", MyBean.class).isInvoked();
assertFalse(invoked, "Bean should not be invoked");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java
index 3b4123253fb..f40bc5b3bc5 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.amqp;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.infra.activemq.services.ActiveMQEmbeddedService;
import org.apache.camel.test.infra.activemq.services.ActiveMQEmbeddedServiceBuilder;
@@ -52,7 +53,7 @@ public class AMQPToDTest extends CamelTestSupport {
template.sendBodyAndHeader("direct:start", "Hello bar", "where", "bar");
template.sendBodyAndHeader("direct:start", "Hello beer", "where", "beer");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
index de700bbab88..25b4e25f684 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.io.FileUtils;
import org.bouncycastle.asn1.ASN1Primitive;
@@ -55,7 +56,7 @@ public class ASN1DataFormatWithStreamIteratorByteArrayTest extends CamelTestSupp
assertTrue(ASN1Primitive.fromByteArray(arr) instanceof ASN1Primitive);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
index f8df0a29afa..f2faf9da8f4 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
@@ -51,7 +52,7 @@ public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport
assertTrue(exchange.getIn().getBody() instanceof SmsCdr);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -87,7 +88,7 @@ public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport
// fos.close();
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -117,7 +118,7 @@ public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport
assertTrue(exchange.getIn().getBody() instanceof SmsCdr);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void baseDoubleUnmarshalTest(String firstMockEnpointName, String secondMockEnpointName, String directEndpointName)
@@ -152,7 +153,7 @@ public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport
assertEquals(secondUnmarshalledCdr.toString(), firstUnmarshalledCdr.toString());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
index 183662d7a5e..0c11cff2ad6 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.Test;
@@ -50,7 +51,7 @@ public class ASN1DataFormatWithStreamTest extends CamelTestSupport {
assertTrue(Arrays.equals(FileUtils.readFileToByteArray(testFile), exchange.getIn().getBody(byte[].class)));
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
index 796a845421b..450885322c4 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.util.List;
import org.apache.camel.Exchange;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
@@ -49,7 +50,7 @@ public class SpringASN1DataFormatRouteTest extends CamelSpringTestSupport {
assertTrue(exchange.getIn().getBody() instanceof SmsCdr);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapExtractMappingsTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapExtractMappingsTest.java
index a40fb09db48..dd8c31cba5e 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapExtractMappingsTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapExtractMappingsTest.java
@@ -46,7 +46,7 @@ public class AtlasMapExtractMappingsTest extends CamelSpringTestSupport {
producerTemplate.sendBody("direct:start",
new ByteArrayInputStream("{ \"order\": { \"orderId\": \"A123\" }}".getBytes()));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Object body = result.getExchanges().get(0).getIn().getBody();
assertEquals(EXPECTED_BODY, body);
@@ -62,7 +62,7 @@ public class AtlasMapExtractMappingsTest extends CamelSpringTestSupport {
producerTemplate.sendBody("direct:start-n",
new ByteArrayInputStream("{ \"order\": { \"orderId\": \"A123\" }}".getBytes()));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Object body = resultN.getExchanges().get(0).getIn().getBody();
assertEquals(EXPECTED_BODY, body);
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapForceReloadTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapForceReloadTest.java
index cca164e27bb..1e856d61482 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapForceReloadTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapForceReloadTest.java
@@ -56,7 +56,7 @@ public class AtlasMapForceReloadTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
producerTemplate.sendBody("direct:start", tccl.getResourceAsStream(INPUT_FILE));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Object body = result.getExchanges().get(0).getIn().getBody();
assertEquals(EXPECTED_BODY, body);
@@ -65,7 +65,7 @@ public class AtlasMapForceReloadTest extends CamelSpringTestSupport {
Paths.get("target/test-classes/atlasmap-mapping-force-reload.adm"),
StandardCopyOption.REPLACE_EXISTING);
producerTemplate.sendBody("direct:start", tccl.getResourceAsStream(INPUT_FILE));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Object body2 = result.getExchanges().get(0).getIn().getBody();
assertEquals(EXPECTED_BODY, body2);
}
@@ -81,7 +81,7 @@ public class AtlasMapForceReloadTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
producerTemplate.sendBody("direct:start-force-reload", tccl.getResourceAsStream(INPUT_FILE));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Object body = result.getExchanges().get(0).getIn().getBody();
assertEquals(EXPECTED_BODY, body);
@@ -90,7 +90,7 @@ public class AtlasMapForceReloadTest extends CamelSpringTestSupport {
Paths.get("target/test-classes/atlasmap-mapping-force-reload.adm"),
StandardCopyOption.REPLACE_EXISTING);
producerTemplate.sendBody("direct:start", tccl.getResourceAsStream(INPUT_FILE));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Object body2 = result.getExchanges().get(0).getIn().getBody();
InputStream schemaIs = tccl.getResourceAsStream("xml-target-schemaset.xml");
AtlasXmlSchemaSetParser schemaParser = new AtlasXmlSchemaSetParser(tccl);
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJavaToJsonTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJavaToJsonTest.java
index c10a4f9b33a..2164eed6c43 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJavaToJsonTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJavaToJsonTest.java
@@ -45,7 +45,7 @@ public class AtlasMapJavaToJsonTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBody("direct:start", Util.generateMockTwitterStatus());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Message msg = result.getExchanges().get(0).getIn();
assertEquals("application/json", msg.getHeader(Exchange.CONTENT_TYPE));
Object body = msg.getBody();
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonTest.java
index 82f86620709..a00c97ca1bd 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonTest.java
@@ -42,7 +42,7 @@ public class AtlasMapJsonTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBody("direct:start", Util.generateMockTwitterStatus());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Object body = result.getExchanges().get(0).getIn().getBody();
assertEquals(String.class, body.getClass());
ObjectMapper mapper = new ObjectMapper();
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToJavaTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToJavaTest.java
index bfb15f7657e..f26c31e99ab 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToJavaTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToJavaTest.java
@@ -41,7 +41,7 @@ public class AtlasMapJsonToJavaTest extends CamelSpringTestSupport {
final ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBody("direct:start", new ByteArrayInputStream("{\"field1\":\"value1\"}".getBytes()));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Object body = result.getExchanges().get(0).getIn().getBody();
assertEquals(Pojo.class, body.getClass());
assertEquals("value1", ((Pojo) body).getField1());
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToXmlSchemaTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToXmlSchemaTest.java
index ae8b165edd4..5f071318fd9 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToXmlSchemaTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapJsonToXmlSchemaTest.java
@@ -52,7 +52,7 @@ public class AtlasMapJsonToXmlSchemaTest extends CamelSpringTestSupport {
InputStream payloadIs = tccl.getResourceAsStream("json-source.json");
producerTemplate.sendBody("direct:start", payloadIs);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final String body = result.getExchanges().get(0).getIn().getBody(String.class);
assertNotNull(body);
LOG.debug(">>>>> {}", body);
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiDocsTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiDocsTest.java
index afe876cc4e1..d092fe444a8 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiDocsTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiDocsTest.java
@@ -84,7 +84,7 @@ public class AtlasMapMultiDocsTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBodyAndProperty("direct:start", null, "CAPTURED_OUT_MESSAGES_MAP", sourceMap);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange exchange = result.getExchanges().get(0);
Map<?, ?> targetMap = exchange.getProperty("TARGET_MESSAGES_MAP", Map.class);
@@ -113,7 +113,7 @@ public class AtlasMapMultiDocsTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBody("direct:start-body", sourceMap);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange exchange = resultBody.getExchanges().get(0);
Map<?, ?> targetMap = exchange.getIn().getBody(Map.class);
@@ -138,7 +138,7 @@ public class AtlasMapMultiDocsTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBodyAndHeaders("direct:start-header", null, sourceMap);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange exchange = resultBody.getExchanges().get(0);
verifyTargetDocs(exchange.getIn().getHeaders());
}
@@ -164,7 +164,7 @@ public class AtlasMapMultiDocsTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.send(ep, ex);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange exchange = resultBody.getExchanges().get(0);
verifyTargetDocs(exchange.getProperties());
}
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiNSTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiNSTest.java
index 3c2d141924f..176875f4685 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiNSTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapMultiNSTest.java
@@ -57,7 +57,7 @@ public class AtlasMapMultiNSTest extends CamelSpringTestSupport {
c.setFirstName("Jackson");
producerTemplate.sendBody("direct:start", c);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Message message = result.getExchanges().get(0).getIn();
Assertions.assertEquals("application/xml", message.getHeader(Exchange.CONTENT_TYPE));
String out = message.getBody(String.class);
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapSingleDocTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapSingleDocTest.java
index 2eba85b5fde..c44e6a37785 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapSingleDocTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapSingleDocTest.java
@@ -47,7 +47,7 @@ public class AtlasMapSingleDocTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBody("direct:start", javaSource);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
MockEndpoint result = getMockEndpoint("mock:result");
Exchange exchange = result.getExchanges().get(0);
Map<?, ?> targetMap = exchange.getIn().getBody(Map.class);
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapTest.java
index 1d0d7822933..383c5b5b260 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapTest.java
@@ -45,7 +45,7 @@ public class AtlasMapTest extends CamelSpringTestSupport {
ProducerTemplate producerTemplate = context.createProducerTemplate();
producerTemplate.sendBody("direct:start", Util.generateMockTwitterStatus());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Object body = result.getExchanges().get(0).getIn().getBody();
assertEquals(String.class, body.getClass());
ObjectMapper mapper = new ObjectMapper();
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlDefaultNsTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlDefaultNsTest.java
index 26f387a7ccd..2d09c298bdb 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlDefaultNsTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlDefaultNsTest.java
@@ -50,7 +50,7 @@ public class AtlasMapXmlToXmlDefaultNsTest extends CamelSpringTestSupport {
producerTemplate.sendBody("direct:start", new ByteArrayInputStream(
"<Patient xmlns=\"http://hl7.org/fhir\"><id value=\"101138\"></id></Patient>".getBytes()));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final String body = result.getExchanges().get(0).getIn().getBody(String.class);
assertNotNull(body);
diff --git a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlTest.java b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlTest.java
index 12e82414399..f6b3343d72b 100644
--- a/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlTest.java
+++ b/components/camel-atlasmap/src/test/java/org/apache/camel/component/atlasmap/AtlasMapXmlToXmlTest.java
@@ -52,7 +52,7 @@ public class AtlasMapXmlToXmlTest extends CamelSpringTestSupport {
producerTemplate.sendBody("direct:start", new ByteArrayInputStream(
"<tns:Patient xmlns:tns=\"http://hl7.org/fhir\"><tns:id value=\"101138\"></tns:id></tns:Patient>".getBytes()));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final String body = result.getExchanges().get(0).getIn().getBody(String.class);
assertNotNull(body);
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java
index a1131102bed..b0f50b689cd 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java
@@ -44,7 +44,7 @@ public class AtmosProducerDelTest extends AtmosTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
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/AtmosProducerPutFolderWithRemotePathTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutFolderWithRemotePathTest.java
index 02ac594b2e9..d4cbca13f28 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutFolderWithRemotePathTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutFolderWithRemotePathTest.java
@@ -44,7 +44,7 @@ public class AtmosProducerPutFolderWithRemotePathTest extends AtmosTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Exchange> exchanges = mock.getReceivedExchanges();
Exchange exchange = exchanges.get(0);
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
index 835bfc762f3..7216aca8463 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
@@ -40,7 +40,7 @@ public class AtomPollingConsumerIdleMessageTest extends CamelTestSupport {
Awaitility.await().atMost(Duration.ofMillis(500)).untilAsserted(() -> {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNull(mock.getExchanges().get(0).getIn().getBody());
assertNull(mock.getExchanges().get(1).getIn().getBody());
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
index 88e780bb30a..6d557404575 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
@@ -32,7 +32,7 @@ public class AtomPollingUnthrottledTest extends CamelTestSupport {
mock.expectedMessageCount(7);
mock.setResultWaitTime(3000L);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
index 75049367e9c..0df1e92e5bf 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
@@ -41,7 +41,7 @@ public class AtomRouteTest extends CamelTestSupport {
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount(7);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Exchange> list = endpoint.getReceivedExchanges();
String[] expectedTitles = {
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
index de1e0d3e0b7..2519b09bdf0 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
@@ -24,6 +24,7 @@ import javax.activation.FileDataSource;
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.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -51,7 +52,7 @@ public class MessageWithAttachmentRedeliveryIssueTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
AttachmentMessage msg = getMockEndpoint("mock:result").getReceivedExchanges().get(0).getIn(AttachmentMessage.class);
assertNotNull(msg);
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
index b223b3069e2..5e8167ae14b 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -39,7 +40,7 @@ public class WireTapTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange e1 = getMockEndpoint("mock:result").getReceivedExchanges().get(0);
Exchange e2 = getMockEndpoint("mock:tap").getReceivedExchanges().get(0);
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java
index 3bf23718df9..d404d320c97 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws.secretsmanager.integration;
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
@@ -52,7 +53,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -73,7 +74,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -94,7 +95,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -115,7 +116,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -136,7 +137,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("admin");
template.sendBody("direct:username", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -158,7 +159,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -179,7 +180,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -201,7 +202,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -223,7 +224,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -243,7 +244,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("admin");
template.sendBody("direct:username", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -266,7 +267,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -286,7 +287,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("admin");
template.sendBody("direct:username", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -307,7 +308,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -328,7 +329,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -347,7 +348,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("27");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -366,7 +367,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("{\"id\":\"27\"}");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -386,7 +387,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("{\"id\":\"27\"}");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -406,7 +407,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("pippo");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -426,7 +427,7 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("pippo");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -446,6 +447,6 @@ public class SecretsManagerNoEnvPropertiesSourceTestIT extends CamelTestSupport
getMockEndpoint("mock:bar").expectedBodiesReceived("27");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPropertiesSourceTestIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPropertiesSourceTestIT.java
index d855e968271..f290b166d29 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPropertiesSourceTestIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerPropertiesSourceTestIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws.secretsmanager.integration;
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -43,7 +44,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -64,7 +65,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -85,7 +86,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -106,7 +107,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -127,7 +128,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("admin");
template.sendBody("direct:username", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -149,7 +150,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -170,7 +171,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -192,7 +193,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -214,7 +215,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -234,7 +235,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("admin");
template.sendBody("direct:username", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -257,7 +258,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -277,7 +278,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("admin");
template.sendBody("direct:username", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_USE_DEFAULT_CREDENTIALS_PROVIDER", matches = ".*")
@@ -295,7 +296,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("admin");
template.sendBody("direct:username", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -316,7 +317,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -337,7 +338,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -356,7 +357,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("27");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -375,7 +376,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("{\"id\":\"27\"}");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -395,7 +396,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("{\"id\":\"27\"}");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -415,7 +416,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("pippo");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -435,7 +436,7 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("pippo");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AWS_ACCESS_KEY", matches = ".*")
@@ -455,6 +456,6 @@ public class SecretsManagerPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("27");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
index dbbc8898458..6e05941362d 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
@@ -77,7 +77,7 @@ public class AthenaComponentTest extends CamelTestSupport {
GetQueryExecutionResponse result = message.getBody(GetQueryExecutionResponse.class);
assertEquals("11111111-1111-1111-1111-111111111111", result.queryExecution().queryExecutionId());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -100,7 +100,7 @@ public class AthenaComponentTest extends CamelTestSupport {
result.forEach(responses::add);
assertEquals(1, responses.size());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -121,7 +121,7 @@ public class AthenaComponentTest extends CamelTestSupport {
GetQueryResultsResponse result = message.getBody(GetQueryResultsResponse.class);
assertEquals(1, result.resultSet().rows().size());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -145,7 +145,7 @@ public class AthenaComponentTest extends CamelTestSupport {
String result = message.getBody(String.class);
assertEquals("s3://bucket/file.csv", result);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -169,7 +169,7 @@ public class AthenaComponentTest extends CamelTestSupport {
result.queryExecutionIds());
assertEquals("next-token", result.nextToken());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -191,7 +191,7 @@ public class AthenaComponentTest extends CamelTestSupport {
assertNull(message.getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
index bbdc2bd3fa0..8e4acf110b5 100644
--- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
+++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
@@ -55,7 +55,7 @@ public class CwComponentTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/CwComponentIT.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/CwComponentIT.java
index 5ec45b8094b..83ee9f416ab 100644
--- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/CwComponentIT.java
+++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/CwComponentIT.java
@@ -42,7 +42,7 @@ public class CwComponentIT extends Aws2CwBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
index 1621714860b..7b201c303b9 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
@@ -21,6 +21,7 @@ import java.util.Collection;
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.AbstractApplicationContext;
@@ -170,7 +171,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeInstanceStatusResponse resultGet = (DescribeInstanceStatusResponse) exchange.getMessage().getBody();
assertEquals(1, resultGet.instanceStatuses().size());
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
index 0714f0841c9..0d7ec2a3e42 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
@@ -196,7 +196,7 @@ public class EC2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeInstanceStatusResponse resultGet = (DescribeInstanceStatusResponse) exchange.getMessage().getBody();
assertEquals(1, resultGet.instanceStatuses().size());
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java
index 6c81a246f9e..601e8dccb64 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java
@@ -47,7 +47,7 @@ public class ECS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterArns().size());
@@ -66,7 +66,7 @@ public class ECS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterArns().size());
@@ -85,7 +85,7 @@ public class ECS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateClusterResponse resultGet = (CreateClusterResponse) exchange.getIn().getBody();
assertEquals("Test", resultGet.cluster().clusterName());
@@ -103,7 +103,7 @@ public class ECS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeClustersResponse resultGet = exchange.getIn().getBody(DescribeClustersResponse.class);
assertEquals("Test", resultGet.clusters().get(0).clusterName());
@@ -121,7 +121,7 @@ public class ECS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteClusterResponse resultGet = exchange.getIn().getBody(DeleteClusterResponse.class);
assertEquals("Test", resultGet.cluster().clusterName());
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java
index 19a4e332760..7124df07fac 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java
@@ -51,7 +51,7 @@ public class ECS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterArns().size());
@@ -70,7 +70,7 @@ public class ECS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterArns().size());
@@ -89,7 +89,7 @@ public class ECS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateClusterResponse resultGet = (CreateClusterResponse) exchange.getIn().getBody();
assertEquals("Test", resultGet.cluster().clusterName());
@@ -107,7 +107,7 @@ public class ECS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeClustersResponse resultGet = exchange.getIn().getBody(DescribeClustersResponse.class);
assertEquals("Test", resultGet.clusters().get(0).clusterName());
@@ -125,7 +125,7 @@ public class ECS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteClusterResponse resultGet = exchange.getIn().getBody(DeleteClusterResponse.class);
assertEquals("Test", resultGet.cluster().clusterName());
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java
index 2bffc7ccc5a..be3dd4d80cf 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java
@@ -48,7 +48,7 @@ public class EKS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusters().size());
@@ -67,7 +67,7 @@ public class EKS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusters().size());
@@ -89,7 +89,7 @@ public class EKS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateClusterResponse resultGet = (CreateClusterResponse) exchange.getIn().getBody();
assertEquals("Test", resultGet.cluster().name());
@@ -107,7 +107,7 @@ public class EKS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeClusterResponse resultGet = exchange.getIn().getBody(DescribeClusterResponse.class);
assertEquals("Test", resultGet.cluster().name());
@@ -125,7 +125,7 @@ public class EKS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteClusterResponse resultGet = exchange.getIn().getBody(DeleteClusterResponse.class);
assertEquals("Test", resultGet.cluster().name());
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java
index 086471ec80a..6e781b56037 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java
@@ -52,7 +52,7 @@ public class EKS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusters().size());
@@ -71,7 +71,7 @@ public class EKS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusters().size());
@@ -93,7 +93,7 @@ public class EKS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateClusterResponse resultGet = (CreateClusterResponse) exchange.getIn().getBody();
assertEquals("Test", resultGet.cluster().name());
@@ -111,7 +111,7 @@ public class EKS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeClusterResponse resultGet = exchange.getIn().getBody(DescribeClusterResponse.class);
assertEquals("Test", resultGet.cluster().name());
@@ -129,7 +129,7 @@ public class EKS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteClusterResponse resultGet = exchange.getIn().getBody(DeleteClusterResponse.class);
assertEquals("Test", resultGet.cluster().name());
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java
index 1768ed49901..513021a60cf 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java
@@ -87,7 +87,7 @@ public class EventbridgePutRuleManualIT extends CamelTestSupport {
exchange.getIn().setHeader(EventbridgeConstants.TARGETS, targets);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java
index ba75141bf22..96a63ec1696 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java
@@ -110,7 +110,7 @@ public class EventbridgePutRuleSqsManualIT extends CamelTestSupport {
clientS3.deleteBucket(DeleteBucketRequest.builder().bucket("test-2567810").build());
Thread.sleep(60000);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java
index 4db67b72534..92974690855 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java
@@ -85,7 +85,7 @@ public class EventbridgeDeleteRuleIT extends Aws2EventbridgeBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNotNull(ex.getIn().getBody(DeleteRuleResponse.class));
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java
index bc1ecd4fa96..71cbb8a730b 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java
@@ -73,7 +73,7 @@ public class EventbridgeDescribeRuleIT extends Aws2EventbridgeBase {
exchange.getIn().setHeader(EventbridgeConstants.RULE_NAME, "firstrule");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNotNull(result.getExchanges().get(0).getMessage().getBody(DescribeRuleResponse.class).eventPattern());
assertEquals("firstrule", result.getExchanges().get(0).getMessage().getBody(DescribeRuleResponse.class).name());
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDisableRuleIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDisableRuleIT.java
index b84ec1aa7d6..807a4b6d425 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDisableRuleIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDisableRuleIT.java
@@ -86,7 +86,7 @@ public class EventbridgeDisableRuleIT extends Aws2EventbridgeBase {
assertEquals(1, resp.rules().size());
assertEquals("firstrule", resp.rules().get(0).name());
assertEquals(RuleState.DISABLED, resp.rules().get(0).state());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeEnableRuleIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeEnableRuleIT.java
index 88d8f1050f9..0247a71508d 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeEnableRuleIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeEnableRuleIT.java
@@ -94,7 +94,7 @@ public class EventbridgeEnableRuleIT extends Aws2EventbridgeBase {
assertEquals(1, resp.rules().size());
assertEquals("firstrule", resp.rules().get(0).name());
assertEquals(RuleState.ENABLED, resp.rules().get(0).state());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRuleNamesByTargetIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRuleNamesByTargetIT.java
index c16ffaac4f2..e149d59169a 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRuleNamesByTargetIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRuleNamesByTargetIT.java
@@ -74,7 +74,7 @@ public class EventbridgeListRuleNamesByTargetIT extends Aws2EventbridgeBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertEquals(1, result.getExchanges().get(0).getIn().getBody(ListRuleNamesByTargetResponse.class).ruleNames().size());
assertEquals("firstrule",
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRulesIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRulesIT.java
index 77137654a48..326adc751f9 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRulesIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListRulesIT.java
@@ -76,7 +76,7 @@ public class EventbridgeListRulesIT extends Aws2EventbridgeBase {
assertEquals(true, resp.hasRules());
assertEquals(1, resp.rules().size());
assertEquals("firstrule", resp.rules().get(0).name());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java
index 3fe9a6262e4..d1e9862d729 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java
@@ -72,7 +72,7 @@ public class EventbridgeListTargetsByRuleIT extends Aws2EventbridgeBase {
exchange.getIn().setHeader(EventbridgeConstants.RULE_NAME, "firstrule");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertEquals(1, result.getExchanges().get(0).getIn().getBody(ListTargetsByRuleResponse.class).targets().size());
assertEquals("sqs-queue",
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
index 339d953e95f..0c8012ac23e 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
@@ -50,7 +50,7 @@ public class EventbridgePutEventsIT extends Aws2EventbridgeBase {
exchange.getIn().setBody("Test Event");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Assert.assertTrue(result.getExchanges().get(0).getMessage().getBody(PutEventsResponse.class).hasEntries());
Assert.assertEquals(1, result.getExchanges().get(0).getMessage().getBody(PutEventsResponse.class).entries().size());
Assert.assertNotNull(
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutRuleIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutRuleIT.java
index 51035a79581..e8225c6f947 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutRuleIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutRuleIT.java
@@ -65,7 +65,7 @@ public class EventbridgePutRuleIT extends Aws2EventbridgeBase {
exchange.getIn().setHeader(EventbridgeConstants.TARGETS, targets);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java
index 20d02e0dadf..bc01150f55c 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java
@@ -74,7 +74,7 @@ public class EventbridgeRemoveTargetsIT extends Aws2EventbridgeBase {
exchange.getIn().setHeader(EventbridgeConstants.TARGETS_IDS, targets);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
}
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
index ba144b34a04..abcb061972b 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
@@ -58,7 +58,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListAccessKeysResponse resultGet = (ListAccessKeysResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.accessKeyMetadata().size());
@@ -77,7 +77,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateUserResponse resultGet = (CreateUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
@@ -95,7 +95,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateUserResponse resultGet = (CreateUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
@@ -113,7 +113,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteUserResponse resultGet = (DeleteUserResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -130,7 +130,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListUsersResponse resultGet = (ListUsersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.users().size());
@@ -149,7 +149,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateAccessKeyResponse resultGet = (CreateAccessKeyResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.accessKey().accessKeyId());
@@ -169,7 +169,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteAccessKeyResponse resultGet = (DeleteAccessKeyResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -187,7 +187,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetUserResponse resultGet = (GetUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
@@ -206,7 +206,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
UpdateAccessKeyResponse resultGet = (UpdateAccessKeyResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -225,7 +225,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateGroupResponse resultGet = (CreateGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -244,7 +244,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteGroupResponse resultGet = (DeleteGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -260,7 +260,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListGroupsResponse resultGet = (ListGroupsResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -280,7 +280,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
AddUserToGroupResponse resultGet = (AddUserToGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -298,7 +298,7 @@ public class IAMProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
RemoveUserFromGroupResponse resultGet = (RemoveUserFromGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
index 89aea0d6061..9cb0c602800 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
@@ -62,7 +62,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListAccessKeysResponse resultGet = (ListAccessKeysResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.accessKeyMetadata().size());
@@ -81,7 +81,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateUserResponse resultGet = (CreateUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
@@ -99,7 +99,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateUserResponse resultGet = (CreateUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
@@ -117,7 +117,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteUserResponse resultGet = (DeleteUserResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -134,7 +134,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListUsersResponse resultGet = (ListUsersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.users().size());
@@ -153,7 +153,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateAccessKeyResponse resultGet = (CreateAccessKeyResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.accessKey().accessKeyId());
@@ -173,7 +173,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteAccessKeyResponse resultGet = (DeleteAccessKeyResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -191,7 +191,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetUserResponse resultGet = (GetUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
@@ -210,7 +210,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
UpdateAccessKeyResponse resultGet = (UpdateAccessKeyResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -229,7 +229,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateGroupResponse resultGet = (CreateGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -248,7 +248,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteGroupResponse resultGet = (DeleteGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -264,7 +264,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListGroupsResponse resultGet = (ListGroupsResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -284,7 +284,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
AddUserToGroupResponse resultGet = (AddUserToGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
@@ -302,7 +302,7 @@ public class IAMProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
RemoveUserFromGroupResponse resultGet = (RemoveUserFromGroupResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserIT.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserIT.java
index b1907768e47..7cce468574f 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserIT.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserIT.java
@@ -45,7 +45,7 @@ public class IAMCreateUserIT extends Aws2IAMBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateUserResponse resultGet = (CreateUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserPojoIT.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserPojoIT.java
index 2eb93cf4ca1..08c2382bedc 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserPojoIT.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMCreateUserPojoIT.java
@@ -46,7 +46,7 @@ public class IAMCreateUserPojoIT extends Aws2IAMBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateUserResponse resultGet = (CreateUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMDeleteUserIT.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMDeleteUserIT.java
index 606aadfdf70..b3377ce235b 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMDeleteUserIT.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMDeleteUserIT.java
@@ -52,7 +52,7 @@ public class IAMDeleteUserIT extends Aws2IAMBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteUserResponse resultGet = (DeleteUserResponse) exchange.getIn().getBody();
assertNotNull(resultGet);
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMGetUserIT.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMGetUserIT.java
index 058744c67c5..190f15a61a8 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMGetUserIT.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMGetUserIT.java
@@ -52,7 +52,7 @@ public class IAMGetUserIT extends Aws2IAMBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetUserResponse resultGet = (GetUserResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.user().userName());
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListAccessKeyIT.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListAccessKeyIT.java
index 9d8b6b63099..184511f2db5 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListAccessKeyIT.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListAccessKeyIT.java
@@ -57,7 +57,7 @@ public class IAMListAccessKeyIT extends Aws2IAMBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListUserIT.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListUserIT.java
index 5ef45a63d90..f27e2cc02ba 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListUserIT.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/IAMListUserIT.java
@@ -51,7 +51,7 @@ public class IAMListUserIT extends Aws2IAMBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListUsersResponse resultGet = (ListUsersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.users().size());
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
index da08f89aedc..969b644a9ad 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
@@ -48,7 +48,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListKeysResponse resultGet = (ListKeysResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.keys().size());
@@ -66,7 +66,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateKeyResponse resultGet = (CreateKeyResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.keyMetadata().keyId());
@@ -85,7 +85,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@@ -101,7 +101,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@@ -117,7 +117,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ScheduleKeyDeletionResponse resultGet = (ScheduleKeyDeletionResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.keyId());
@@ -135,7 +135,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeKeyResponse resultGet = exchange.getIn().getBody(DescribeKeyResponse.class);
assertEquals("test", resultGet.keyMetadata().keyId());
@@ -155,7 +155,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListKeysResponse resultGet = (ListKeysResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.keys().size());
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
index 74f5a783bf7..9aa898470d2 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
@@ -52,7 +52,7 @@ public class KMSProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListKeysResponse resultGet = (ListKeysResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.keys().size());
@@ -71,7 +71,7 @@ public class KMSProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListKeysResponse resultGet = (ListKeysResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.keys().size());
@@ -89,7 +89,7 @@ public class KMSProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateKeyResponse resultGet = (CreateKeyResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.keyMetadata().keyId());
@@ -108,7 +108,7 @@ public class KMSProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@@ -124,7 +124,7 @@ public class KMSProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@@ -140,7 +140,7 @@ public class KMSProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ScheduleKeyDeletionResponse resultGet = (ScheduleKeyDeletionResponse) exchange.getIn().getBody();
assertEquals("test", resultGet.keyId());
@@ -158,7 +158,7 @@ public class KMSProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeKeyResponse resultGet = exchange.getIn().getBody(DescribeKeyResponse.class);
assertEquals("test", resultGet.keyMetadata().keyId());
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
index bac0baac180..37759047865 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
@@ -49,7 +49,7 @@ public class KmsCreateKeyIT extends Aws2KmsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertNotNull(result.getExchanges().get(0).getIn().getBody(CreateKeyResponse.class).keyMetadata().keyId());
}
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java
index 26a56973adb..ca62fd8679a 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java
@@ -61,7 +61,7 @@ public class KmsDescribeKeyIT extends Aws2KmsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertEquals(KeyState.ENABLED,
result.getExchanges().get(0).getIn().getBody(DescribeKeyResponse.class).keyMetadata().keyState());
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
index 019cbcf8fc7..150688b3ba1 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
@@ -69,7 +69,7 @@ public class KmsDisableKeyIT extends Aws2KmsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertTrue(result.getExchanges().get(0).getIn().getBody(ListKeysResponse.class).hasKeys());
}
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java
index 7b148bfc569..775bb9541e3 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java
@@ -78,7 +78,7 @@ public class KmsEnableKeyIT extends Aws2KmsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertTrue(result.getExchanges().get(0).getIn().getBody(ListKeysResponse.class).hasKeys());
}
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
index cdab24a5fb2..2b21fd5ac04 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
@@ -57,7 +57,7 @@ public class KmsListKeysIT extends Aws2KmsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertTrue(result.getExchanges().get(0).getIn().getBody(ListKeysResponse.class).hasKeys());
}
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java
index 9c5f3f70da5..a41b374b119 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java
@@ -70,7 +70,7 @@ public class KmsScheduleDeleteKeyIT extends Aws2KmsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertEquals(KeyState.PENDING_DELETION,
result.getExchanges().get(0).getIn().getBody(DescribeKeyResponse.class).keyMetadata().keyState());
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
index 890da56ea3c..b21e53df7d8 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
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.AbstractApplicationContext;
@@ -155,7 +156,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.EVENT_SOURCE_BATCH_SIZE, 100);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateEventSourceMappingResponse result = exchange.getMessage().getBody(CreateEventSourceMappingResponse.class);
assertEquals("arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName", result.functionArn());
@@ -169,7 +170,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.EVENT_SOURCE_UUID, "a1239494949382882383");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteEventSourceMappingResponse result = exchange.getMessage().getBody(DeleteEventSourceMappingResponse.class);
assertTrue(result.state().equalsIgnoreCase("Deleting"));
@@ -182,7 +183,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
public void process(Exchange exchange) {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListEventSourceMappingsResponse result = exchange.getMessage().getBody(ListEventSourceMappingsResponse.class);
assertEquals("arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName",
@@ -199,7 +200,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
"arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListTagsResponse result = (ListTagsResponse) exchange.getMessage().getBody();
assertEquals("lambda-tag", result.tags().get("test"));
@@ -218,7 +219,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.RESOURCE_TAGS, tags);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
TagResourceResponse result = (TagResourceResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -237,7 +238,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.RESOURCE_TAG_KEYS, tagKeys);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
UntagResourceResponse result = (UntagResourceResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -252,7 +253,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.VERSION_DESCRIPTION, "This is my description");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
PublishVersionResponse result = (PublishVersionResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -269,7 +270,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.VERSION_DESCRIPTION, "This is my description");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListVersionsByFunctionResponse result = (ListVersionsByFunctionResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -288,7 +289,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_VERSION, "1");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateAliasResponse result = (CreateAliasResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -306,7 +307,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_ALIAS_NAME, "alias");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteAliasResponse result = (DeleteAliasResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -321,7 +322,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_ALIAS_NAME, "alias");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetAliasResponse result = (GetAliasResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -339,7 +340,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_VERSION, "1");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListAliasesResponse result = (ListAliasesResponse) exchange.getMessage().getBody();
assertNotNull(result);
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
index 301ded566d8..a2d20d10c80 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
@@ -45,7 +45,7 @@ public class LambdaProducerDefaultFunctionTest extends CamelTestSupport {
exchange.getIn().setBody("{\"name\":\"Camel\"}");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNotNull(exchange.getMessage().getBody(String.class));
assertEquals("{\"Hello\":\"Camel\"}", exchange.getMessage().getBody(String.class));
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
index d33187f6617..0645e21fec8 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
@@ -164,7 +164,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.EVENT_SOURCE_BATCH_SIZE, 100);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateEventSourceMappingResponse result = exchange.getMessage().getBody(CreateEventSourceMappingResponse.class);
assertEquals("arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName", result.functionArn());
@@ -178,7 +178,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.EVENT_SOURCE_UUID, "a1239494949382882383");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteEventSourceMappingResponse result = exchange.getMessage().getBody(DeleteEventSourceMappingResponse.class);
assertTrue(result.state().equalsIgnoreCase("Deleting"));
@@ -191,7 +191,7 @@ public class LambdaProducerTest extends CamelTestSupport {
public void process(Exchange exchange) {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListEventSourceMappingsResponse result = exchange.getMessage().getBody(ListEventSourceMappingsResponse.class);
assertEquals("arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName",
@@ -208,7 +208,7 @@ public class LambdaProducerTest extends CamelTestSupport {
"arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListTagsResponse result = (ListTagsResponse) exchange.getMessage().getBody();
assertEquals("lambda-tag", result.tags().get("test"));
@@ -227,7 +227,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.RESOURCE_TAGS, tags);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
TagResourceResponse result = (TagResourceResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -246,7 +246,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.RESOURCE_TAG_KEYS, tagKeys);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
UntagResourceResponse result = (UntagResourceResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -261,7 +261,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.VERSION_DESCRIPTION, "This is my description");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
PublishVersionResponse result = (PublishVersionResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -278,7 +278,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.VERSION_DESCRIPTION, "This is my description");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListVersionsByFunctionResponse result = (ListVersionsByFunctionResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -297,7 +297,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_VERSION, "1");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateAliasResponse result = (CreateAliasResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -315,7 +315,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_ALIAS_NAME, "alias");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteAliasResponse result = (DeleteAliasResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -330,7 +330,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_ALIAS_NAME, "alias");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetAliasResponse result = (GetAliasResponse) exchange.getMessage().getBody();
assertNotNull(result);
@@ -348,7 +348,7 @@ public class LambdaProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(Lambda2Constants.FUNCTION_VERSION, "1");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListAliasesResponse result = (ListAliasesResponse) exchange.getMessage().getBody();
assertNotNull(result);
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java
index 44c6d2429d6..6a4b584ae43 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java
@@ -64,7 +64,7 @@ public class LambdaCreateFunctionIT extends Aws2LambdaBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateFunctionResponse resp = result.getExchanges().get(0).getIn().getBody(CreateFunctionResponse.class);
assertEquals("GetHelloWithName", resp.functionName());
assertEquals("Hello with node.js on Lambda", resp.description());
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
index 10c46e0a067..2da31fbc75f 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
@@ -70,7 +70,7 @@ public class LambdaDeleteFunctionIT extends Aws2LambdaBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteFunctionResponse resp = result.getExchanges().get(0).getIn().getBody(DeleteFunctionResponse.class);
assertTrue(resp.sdkHttpResponse().isSuccessful());
}
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java
index b7d393afd4b..96ede95ed14 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java
@@ -71,7 +71,7 @@ public class LambdaGetFunctionIT extends Aws2LambdaBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetFunctionResponse resp = result.getExchanges().get(0).getIn().getBody(GetFunctionResponse.class);
assertEquals("GetHelloWithName", resp.configuration().functionName());
assertEquals("Hello with node.js on Lambda", resp.configuration().description());
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
index 09c8478e32f..c0478af7d22 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
@@ -71,7 +71,7 @@ public class LambdaListFunctionsIT extends Aws2LambdaBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListFunctionsResponse resp = result.getExchanges().get(0).getIn().getBody(ListFunctionsResponse.class);
assertEquals(1, resp.functions().size());
assertEquals("GetHelloWithName", resp.functions().get(0).functionName());
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java
index 49634c98f4b..55bdaf37b54 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java
@@ -70,7 +70,7 @@ public class LambdaPublishVersionIT extends Aws2LambdaBase {
exchange.getIn().setHeader(Lambda2Constants.VERSION_DESCRIPTION, "This is my description");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
PublishVersionResponse resp = result.getExchanges().get(0).getMessage().getBody(PublishVersionResponse.class);
assertNotNull(resp);
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java
index 4f712226593..b424a31f2e5 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java
@@ -56,7 +56,7 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListBrokersResponse resultGet = (ListBrokersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.brokerSummaries().size());
@@ -76,7 +76,7 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListBrokersResponse resultGet = (ListBrokersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.brokerSummaries().size());
@@ -107,7 +107,7 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateBrokerResponse resultGet = (CreateBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
@@ -126,7 +126,7 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteBrokerResponse resultGet = (DeleteBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
@@ -144,7 +144,7 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -163,7 +163,7 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
UpdateBrokerResponse resultGet = (UpdateBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
}
@@ -184,7 +184,7 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeBrokerResponse resultGet = (DescribeBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
}
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java
index 84f7277e553..6d5055d5b7e 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java
@@ -60,7 +60,7 @@ public class MQProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListBrokersResponse resultGet = (ListBrokersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.brokerSummaries().size());
@@ -80,7 +80,7 @@ public class MQProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListBrokersResponse resultGet = (ListBrokersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.brokerSummaries().size());
@@ -111,7 +111,7 @@ public class MQProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateBrokerResponse resultGet = (CreateBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
@@ -130,7 +130,7 @@ public class MQProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteBrokerResponse resultGet = (DeleteBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
@@ -148,7 +148,7 @@ public class MQProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -167,7 +167,7 @@ public class MQProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
UpdateBrokerResponse resultGet = (UpdateBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
}
@@ -188,7 +188,7 @@ public class MQProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeBrokerResponse resultGet = (DescribeBrokerResponse) exchange.getIn().getBody();
assertEquals("1", resultGet.brokerId());
}
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java
index ea4ce941e4d..023bb37455d 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java
@@ -48,7 +48,7 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterInfoList().size());
@@ -66,7 +66,7 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterInfoList().size());
@@ -88,7 +88,7 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateClusterResponse resultGet = (CreateClusterResponse) exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.clusterName());
@@ -106,7 +106,7 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteClusterResponse resultGet = (DeleteClusterResponse) exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.clusterArn());
@@ -124,7 +124,7 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeClusterResponse resultGet = (DescribeClusterResponse) exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.clusterInfo().clusterArn());
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java
index 9341d6c8148..678c397ee9c 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java
@@ -52,7 +52,7 @@ public class MSKProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterInfoList().size());
@@ -70,7 +70,7 @@ public class MSKProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListClustersResponse resultGet = (ListClustersResponse) exchange.getIn().getBody();
assertEquals(1, resultGet.clusterInfoList().size());
@@ -92,7 +92,7 @@ public class MSKProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
CreateClusterResponse resultGet = (CreateClusterResponse) exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.clusterName());
@@ -110,7 +110,7 @@ public class MSKProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteClusterResponse resultGet = (DeleteClusterResponse) exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.clusterArn());
@@ -128,7 +128,7 @@ public class MSKProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DescribeClusterResponse resultGet = (DescribeClusterResponse) exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.clusterInfo().clusterArn());
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java
index 60e60111fdf..23ab66bec17 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java
@@ -66,7 +66,7 @@ public class S3ComponentManualIT extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertResultExchange(result.getExchanges().get(0));
assertResultExchange(result.getExchanges().get(1));
@@ -86,7 +86,7 @@ public class S3ComponentManualIT extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertResultExchange(result.getExchanges().get(0));
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java
index c043b63078d..a2773a8ec9f 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIT.java
@@ -68,7 +68,7 @@ public class S3ConsumerIT extends Aws2S3Base {
});
Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> assertMockEndpointsSatisfied());
+ .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
index 24c90ca3e55..fe616f94b1d 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
@@ -51,7 +51,7 @@ public class S3ConsumerIgnoreBodyIT extends Aws2S3Base {
});
Awaitility.await().atMost(10, TimeUnit.SECONDS)
- .untilAsserted(() -> assertMockEndpointsSatisfied());
+ .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
Assert.assertNull(result.getExchanges().get(0).getMessage().getBody());
}
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
index 4db6566e0c6..274a30eb449 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
@@ -67,7 +67,7 @@ public class S3ConsumerIncludeBodyIT extends Aws2S3Base {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(3, result.getExchanges().size());
assertNotNull(result.getExchanges().get(0).getMessage().getBody());
}
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java
index a2f8a11274b..5c6bf2bb645 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java
@@ -102,7 +102,7 @@ public class S3ConsumerManualIT extends CamelTestSupport {
});
Thread.sleep(10000);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java
index d5140e4826a..b5d76850466 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java
@@ -110,7 +110,7 @@ public class S3CopyObjectCustomerKeyIT extends Aws2S3Base {
assertEquals(1, response.size());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java
index 376501e0a9b..eabd9e7b0a8 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java
@@ -80,7 +80,7 @@ public class S3CopyObjectOperationManualIT extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java
index f05d87d4c65..f1c49719fdf 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java
@@ -94,7 +94,7 @@ public class S3CreateDownloadLinkOperationIT extends Aws2S3Base {
assertNotNull(downloadLinkWithUriOverride);
assertTrue(downloadLinkWithUriOverride.startsWith("http://localhost:8080"));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
index ee24b3782e8..b62ebadb503 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
@@ -78,7 +78,7 @@ public class S3CreateDownloadLinkWithProvidedPresignerOperationIT extends Aws2S3
});
assertNotNull(ex1.getMessage().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIT.java
index 39bc6ca5fbc..a199ff36d16 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIT.java
@@ -55,7 +55,7 @@ public class S3DeleteBucketOperationIT extends Aws2S3Base {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIT.java
index 601e462b1e0..7c4eb22e2ff 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIT.java
@@ -91,7 +91,7 @@ public class S3ListObjectsOperationIT extends Aws2S3Base {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIT.java
index a95bb45a829..bdc64dc2a86 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIT.java
@@ -55,7 +55,7 @@ public class S3MultipartUploadOperationIT extends Aws2S3Base {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java
index bc4ff3ad651..f1f155fc02f 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java
@@ -81,7 +81,7 @@ public class S3ObjectRangeOperationManualIT extends CamelTestSupport {
exchange.getIn().setHeader(AWS2S3Constants.RANGE_END, 9);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleEncryptedUploadOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleEncryptedUploadOperationIT.java
index 8b7f42e4443..080763bb6e1 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleEncryptedUploadOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleEncryptedUploadOperationIT.java
@@ -80,7 +80,7 @@ public class S3SimpleEncryptedUploadOperationIT extends Aws2S3Base {
assertEquals("Camel rocks!", c.getIn().getBody(String.class));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleUploadOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleUploadOperationIT.java
index 25353cbd9cb..96766dcd692 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleUploadOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3SimpleUploadOperationIT.java
@@ -70,7 +70,7 @@ public class S3SimpleUploadOperationIT extends Aws2S3Base {
assertEquals(1, resp.size());
assertEquals("camel.txt", resp.get(0).key());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadOperationIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadOperationIT.java
index 26fa90f66c2..c5e720d25cd 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadOperationIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadOperationIT.java
@@ -47,7 +47,7 @@ public class S3StreamUploadOperationIT extends Aws2S3Base {
template.sendBody("direct:stream1", "Andrea\n");
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange ex = template.request("direct:listObjects", new Processor() {
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
index 608d3b47fd9..ddabcc00f64 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
@@ -49,7 +49,7 @@ public class S3StreamUploadTimeoutIT extends Aws2S3Base {
}
Awaitility.await().atMost(11, TimeUnit.SECONDS)
- .untilAsserted(() -> assertMockEndpointsSatisfied());
+ .untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
Awaitility.await().atMost(11, TimeUnit.SECONDS)
.untilAsserted(() -> {
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersTest.java
index cecf52ea3d3..4e48d257fc9 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersTest.java
@@ -32,7 +32,7 @@ public class SqsBatchConsumerConcurrentConsumersTest extends CamelTestSupport {
@Test
public void receiveBatch() throws Exception {
mock.expectedMessageCount(5);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@BindToRegistry("amazonSQSClient")
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
index 1fc5f252773..f2a476f3179 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
@@ -33,7 +33,7 @@ public class SqsBatchConsumerTest extends CamelTestSupport {
@Test
public void receiveBatch() throws Exception {
mock.expectedMessageCount(5);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
mock.message(0).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(0);
mock.message(1).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(1);
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
index 6db39ff6ee7..cf92e186344 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
@@ -52,7 +52,7 @@ public class SqsComponentSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange resultExchange = result.getExchanges().get(0);
assertEquals("This is my message text.", resultExchange.getIn().getBody());
@@ -76,7 +76,7 @@ public class SqsComponentSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange resultExchange = result.getExchanges().get(0);
assertEquals("This is my message text.", resultExchange.getIn().getBody());
@@ -106,7 +106,7 @@ public class SqsComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setBody(c);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
SendMessageBatchResponse res = result.getExchanges().get(0).getIn().getBody(SendMessageBatchResponse.class);
assertEquals(2, res.failed().size());
assertEquals(2, res.successful().size());
@@ -123,7 +123,7 @@ public class SqsComponentSpringTest extends CamelSpringTestSupport {
exchange.getIn().setHeader(Sqs2Constants.RECEIPT_HANDLE, "123456");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteMessageResponse res = result.getExchanges().get(0).getIn().getBody(DeleteMessageResponse.class);
assertNotNull(res);
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
index 251a21284dc..58edc046396 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
@@ -51,7 +51,7 @@ public class SqsComponentTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange resultExchange = result.getExchanges().get(0);
assertEquals("This is my message text.", resultExchange.getIn().getBody());
@@ -76,7 +76,7 @@ public class SqsComponentTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange resultExchange = result.getExchanges().get(0);
assertEquals("This is my message text.", resultExchange.getIn().getBody());
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
index 93f9869b121..900b8789c2f 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
@@ -38,7 +38,7 @@ public class SqsConsumerIdleMessageTest extends CamelTestSupport {
Thread.sleep(110);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNull(mock.getExchanges().get(0).getIn().getBody());
assertNull(mock.getExchanges().get(1).getIn().getBody());
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
index 2a5b8fc7cab..1b5414bfa95 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
@@ -57,7 +57,8 @@ public class SqsDoesNotExtendMessageVisibilityTest extends CamelTestSupport {
message.receiptHandle(RECEIPT_HANDLE);
this.client.messages.add(message.build());
- assertMockEndpointsSatisfied(); // Wait for message to arrive.
+ // Wait for message to arrive.
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(0, this.client.changeMessageVisibilityRequests.size());
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
index cda94888088..24ac05198e7 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
@@ -59,7 +59,7 @@ public class SqsProducerBatchTest extends CamelTestSupport {
exchange.getIn().setBody(c);
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
SendMessageBatchResponse res = result.getExchanges().get(0).getIn().getBody(SendMessageBatchResponse.class);
assertEquals(2, res.failed().size());
assertEquals(2, res.successful().size());
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java
index dc4f50f6788..3b91867758a 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java
@@ -49,7 +49,7 @@ public class SqsProducerDeleteQueueTest extends CamelTestSupport {
public void process(Exchange exchange) {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteQueueResponse res = result.getExchanges().get(0).getIn().getBody(DeleteQueueResponse.class);
assertNotNull(res);
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
index 12024f0e49b..cc386fe1eed 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
@@ -51,7 +51,7 @@ public class SqsProducerDeleteTest extends CamelTestSupport {
exchange.getIn().setHeader(Sqs2Constants.RECEIPT_HANDLE, "123456");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DeleteMessageResponse res = result.getExchanges().get(0).getIn().getBody(DeleteMessageResponse.class);
assertNotNull(res);
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
index 27a7445f0fa..b4d6f6eeeff 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
@@ -52,7 +52,7 @@ public class SqsProducerListQueuesTest extends CamelTestSupport {
exchange.getIn().setHeader(Sqs2Constants.RECEIPT_HANDLE, "123456");
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
ListQueuesResponse res = result.getExchanges().get(0).getIn().getBody(ListQueuesResponse.class);
assertNotNull(res);
assertEquals(2, res.queueUrls().size());
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java
index d477fba004d..887c24ca31a 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java
@@ -50,7 +50,7 @@ public class SqsProducerPurgeTest extends CamelTestSupport {
public void process(Exchange exchange) {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
PurgeQueueResponse res = result.getExchanges().get(0).getIn().getBody(PurgeQueueResponse.class);
assertNotNull(res);
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentLocalstackIT.java
index c29917e0da0..5e5d8534d46 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentLocalstackIT.java
@@ -47,7 +47,7 @@ public class SqsComponentLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange resultExchange = result.getExchanges().get(0);
assertEquals("This is my message text.", resultExchange.getIn().getBody());
@@ -71,7 +71,7 @@ public class SqsComponentLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange resultExchange = result.getExchanges().get(0);
assertEquals("This is my message text.", resultExchange.getIn().getBody());
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageLocalstackIT.java
index 32f409f9d73..90e3538a9d6 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageLocalstackIT.java
@@ -49,7 +49,7 @@ public class SqsConsumerMessageLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java
index a27f627b34d..306dea62e12 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java
@@ -54,7 +54,7 @@ public class SqsDeadletterWithClientRegistryLocalstackIT extends Aws2SQSBaseTest
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerAutoCreateQueueLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerAutoCreateQueueLocalstackIT.java
index 3833c1db289..cd319632a67 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerAutoCreateQueueLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerAutoCreateQueueLocalstackIT.java
@@ -67,7 +67,7 @@ public class SqsProducerAutoCreateQueueLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoLocalstackIT.java
index 742ab95b3fd..e0a48ae2664 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoLocalstackIT.java
@@ -49,7 +49,7 @@ public class SqsProducerBatchSendFifoLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendLocalstackIT.java
index 0297681f396..565cc2aad88 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendLocalstackIT.java
@@ -53,7 +53,7 @@ public class SqsProducerBatchSendLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendWithSeparatorLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendWithSeparatorLocalstackIT.java
index 888385e18ed..51b73c8da9d 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendWithSeparatorLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendWithSeparatorLocalstackIT.java
@@ -44,7 +44,7 @@ public class SqsProducerBatchSendWithSeparatorLocalstackIT extends Aws2SQSBaseTe
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageLocalstackIT.java
index 8351bb279b2..cd5475cdb71 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageLocalstackIT.java
@@ -43,7 +43,7 @@ public class SqsProducerDeleteMessageLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java
index a54320bb16a..8e10866644d 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java
@@ -49,7 +49,7 @@ public class SqsProducerSendByteArrayLocalstackIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Assert.assertEquals(3, result.getExchanges().get(0).getMessage().getHeaders().size());
Assert.assertEquals("HeaderTest",
Strings.fromByteArray((byte[]) result.getExchanges().get(0).getMessage().getHeaders().get("value1")));
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java
index dc23f7bd096..14c3a99cda0 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java
@@ -55,7 +55,7 @@ public class SqsProducerSendLocalstackMaxAttributesIT extends Aws2SQSBaseTest {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Assert.assertEquals(13, result.getExchanges().get(0).getMessage().getHeaders().size());
}
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java
index 74437712351..40f43bec380 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java
@@ -47,7 +47,7 @@ public class STS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
AssumeRoleResponse resultGet = (AssumeRoleResponse) exchange.getIn().getBody();
assertEquals("arn", resultGet.assumedRoleUser().arn());
@@ -64,7 +64,7 @@ public class STS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetSessionTokenResponse resultGet = (GetSessionTokenResponse) exchange.getIn().getBody();
assertEquals("xxx", resultGet.credentials().accessKeyId());
@@ -81,7 +81,7 @@ public class STS2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetFederationTokenResponse resultGet = (GetFederationTokenResponse) exchange.getIn().getBody();
assertEquals("xxx", resultGet.credentials().accessKeyId());
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java
index 46e71a47f42..916db7eda26 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java
@@ -51,7 +51,7 @@ public class STS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
AssumeRoleResponse resultGet = (AssumeRoleResponse) exchange.getIn().getBody();
assertEquals("arn", resultGet.assumedRoleUser().arn());
@@ -68,7 +68,7 @@ public class STS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetSessionTokenResponse resultGet = (GetSessionTokenResponse) exchange.getIn().getBody();
assertEquals("xxx", resultGet.credentials().accessKeyId());
@@ -86,7 +86,7 @@ public class STS2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
GetFederationTokenResponse resultGet = (GetFederationTokenResponse) exchange.getIn().getBody();
assertEquals("xxx", resultGet.credentials().accessKeyId());
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java
index f98cc312aa4..c534747b19b 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java
@@ -51,7 +51,7 @@ public class StsAssumeRoleIT extends Aws2StsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertNotNull(
result.getExchanges().get(0).getIn().getBody(AssumeRoleResponse.class).credentials().accessKeyId());
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java
index c01a34d1ec8..fa2390dbde5 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java
@@ -50,7 +50,7 @@ public class StsGetFederationTokenIT extends Aws2StsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertNotNull(
result.getExchanges().get(0).getIn().getBody(GetFederationTokenResponse.class).credentials().accessKeyId());
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java
index f14e668397f..a1db7fcd1cf 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java
@@ -49,7 +49,7 @@ public class StsGetSessionTokenIT extends Aws2StsBase {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, result.getExchanges().size());
assertNotNull(result.getExchanges().get(0).getIn().getBody(GetSessionTokenResponse.class).credentials().accessKeyId());
}
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
index c958d588f07..4bde1314943 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
@@ -46,7 +46,7 @@ public class Translate2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
@@ -66,7 +66,7 @@ public class Translate2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
@@ -84,7 +84,7 @@ public class Translate2ProducerSpringTest extends CamelSpringTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
index 4dbe00d97cb..956b7f70d09 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
@@ -49,7 +49,7 @@ public class Translate2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
@@ -69,7 +69,7 @@ public class Translate2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
@@ -87,7 +87,7 @@ public class Translate2ProducerTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = exchange.getIn().getBody(String.class);
assertEquals("Hello", resultGet);
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java
index 6af1a9deefe..041795cfbf3 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java
@@ -56,7 +56,7 @@ public class Translate2ProducerManualIT extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = (String) exchange.getIn().getBody();
assertEquals("Hallo, Miss.", resultGet);
@@ -76,7 +76,7 @@ public class Translate2ProducerManualIT extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = (String) exchange.getIn().getBody();
assertEquals("Hallo, Miss.", resultGet);
@@ -95,7 +95,7 @@ public class Translate2ProducerManualIT extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String resultGet = (String) exchange.getIn().getBody();
assertEquals("Hallo, Miss.", resultGet);
diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
index b507c55fa99..575678a6ae3 100644
--- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
+++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
@@ -84,7 +84,7 @@ public class KeyVaultOperationsTest extends CamelTestSupport {
}
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java
index 76645769b12..ab7463df832 100644
--- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java
+++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.azure.key.vault.integration.operations;
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
@@ -56,7 +57,7 @@ public class KeyVaultPropertiesSourceNoEnvTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -77,7 +78,7 @@ public class KeyVaultPropertiesSourceNoEnvTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -98,7 +99,7 @@ public class KeyVaultPropertiesSourceNoEnvTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -120,7 +121,7 @@ public class KeyVaultPropertiesSourceNoEnvTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -143,7 +144,7 @@ public class KeyVaultPropertiesSourceNoEnvTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
}
diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceTestIT.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceTestIT.java
index 1d02c2d5c23..e9874c77514 100644
--- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceTestIT.java
+++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceTestIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.azure.key.vault.integration.operations;
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -44,7 +45,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -65,7 +66,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -86,7 +87,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -108,7 +109,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -131,7 +132,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
template.sendBody("direct:username", "Hello World");
template.sendBody("direct:password", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
});
}
@@ -153,7 +154,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("password123");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -174,7 +175,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
"{\"username\":\"admin\",\"password\":\"password123\",\"engine\":\"postgres\",\"host\":\"127.0.0.1\",\"port\":\"3128\",\"dbname\":\"db\"}");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -196,7 +197,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
"{\"username\":\"admin\",\"password\":\"password123\",\"engine\":\"postgres\",\"host\":\"127.0.0.1\",\"port\":\"3128\",\"dbname\":\"db\"}");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -217,7 +218,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("pippo");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -238,7 +239,7 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("pippo");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@EnabledIfEnvironmentVariable(named = "CAMEL_VAULT_AZURE_VAULT_NAME", matches = ".*")
@@ -259,6 +260,6 @@ public class KeyVaultPropertiesSourceTestIT extends CamelTestSupport {
getMockEndpoint("mock:bar").expectedBodiesReceived("password123");
template.sendBody("direct:version", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java
index 5354ba3b393..dc382726086 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java
@@ -108,7 +108,7 @@ public abstract class Base64DataFormatTestBase extends CamelTestSupport {
template.sendBody("direct:startEncode", raw);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
byte[] encoded = result.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
assertArrayEquals(expected, encoded);
@@ -119,7 +119,7 @@ public abstract class Base64DataFormatTestBase extends CamelTestSupport {
template.sendBody("direct:startDecode", encoded);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
byte[] decoded = result.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
assertArrayEquals(expected, decoded);
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java
index 11fe1c98f6c..2121b2e36ab 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.dataformat.base64;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -29,7 +30,7 @@ public class Base64PropertiesFunctionTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java
index b9147934d75..0f8956feffb 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java
@@ -34,7 +34,7 @@ public abstract class SpringBase64DataFormatTestBase extends CamelSpringTestSupp
template.sendBody("direct:startEncode", raw);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
byte[] encoded = result.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
assertArrayEquals(expected, encoded);
@@ -45,7 +45,7 @@ public abstract class SpringBase64DataFormatTestBase extends CamelSpringTestSupp
template.sendBody("direct:startDecode", encoded);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
byte[] decoded = result.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
assertArrayEquals(expected, decoded);
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
index 3e2c5688563..0f49882b72a 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
@@ -61,7 +61,7 @@ public class HibernateValidationProviderResolverTest extends CamelTestSupport {
sendBody("direct:test", carWithNullFields);
// Then
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
index bf6afea0a9f..2ffa6b5e3de 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
@@ -22,6 +22,7 @@ import java.util.GregorianCalendar;
import java.util.TimeZone;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.model.dataformat.BindyDataFormat;
import org.apache.camel.model.dataformat.BindyType;
@@ -43,7 +44,7 @@ public class BindyCsvClassTypeAsStringTest extends CamelTestSupport {
template.sendBody("direct:in", generateOrder());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -55,7 +56,7 @@ public class BindyCsvClassTypeAsStringTest extends CamelTestSupport {
template.sendBody("direct:out", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Order order = getMockEndpoint("mock:out").getReceivedExchanges().get(0).getIn().getBody(Order.class);
assertEquals(1, order.getOrderNr());
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
index b9a1ca7eebd..c48d415808e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
@@ -22,6 +22,7 @@ import java.util.GregorianCalendar;
import java.util.TimeZone;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.model.dataformat.BindyDataFormat;
import org.apache.camel.model.dataformat.BindyType;
@@ -43,7 +44,7 @@ public class BindyCsvClassTypeTest extends CamelTestSupport {
template.sendBody("direct:in", generateOrder());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -54,7 +55,7 @@ public class BindyCsvClassTypeTest extends CamelTestSupport {
String data = "1,B2,Keira,Knightley,ISIN,XX23456789,BUY,Share,400.25,EUR,14-01-2009,16-02-2010 23:21:59\r\n";
template.sendBody("direct:out", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Order order = getMockEndpoint("mock:out").getReceivedExchanges().get(0).getIn().getBody(Order.class);
assertEquals(1, order.getOrderNr());
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
index 591d74b5373..c688f9b4ef1 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
@@ -55,7 +55,7 @@ public class BindyCarQuoteAndCommaDelimiterTest extends CamelTestSupport {
template.sendBody("direct:out", HEADER + "\n" + ROW);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Car rec1 = mock.getReceivedExchanges().get(0).getIn().getBody(Car.class);
@@ -78,7 +78,7 @@ public class BindyCarQuoteAndCommaDelimiterTest extends CamelTestSupport {
template.sendBody("direct:in", car);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String body = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
assertEquals(ROW, body);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java
index 05d9f7154fb..f089aabf965 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java
@@ -43,7 +43,7 @@ public class BindyComplexRegexSeparatorTest extends CamelTestSupport {
template.sendBody("direct:unmarshal", "header1,header2\n\"value1\",\"value,2\"");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Example body = mock.getReceivedExchanges().get(0).getIn().getBody(Example.class);
assertEquals("value,2", body.field2);
}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java
index de70b499920..12f8db0bec2 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java
@@ -46,7 +46,7 @@ public class BindyMarshalEndWithLineBreakTest extends CamelTestSupport {
template.sendBody("direct:withlb", csvRecord);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -64,7 +64,7 @@ public class BindyMarshalEndWithLineBreakTest extends CamelTestSupport {
template.sendBody("direct:withoutlb", csvRecord2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java
index a5b9a56e5e0..eff889333ca 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java
@@ -51,7 +51,7 @@ public class BindyPatternLocaleTest extends CamelTestSupport {
unity.setReceiver(10f);
template.sendBody("direct:marshal", unity);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -65,7 +65,7 @@ public class BindyPatternLocaleTest extends CamelTestSupport {
unity.setReceiver(1f);
template.sendBody("direct:marshal", unity);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -79,7 +79,7 @@ public class BindyPatternLocaleTest extends CamelTestSupport {
unity.setReceiver(0f);
template.sendBody("direct:marshal", unity);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
index 31d5db42fdc..c233af26fb1 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
@@ -36,7 +36,7 @@ public class BindyPipeDelimiterTest extends CamelTestSupport {
template.sendBody("direct:unmarshal", "COL1|COL2|COL3\nHAPPY | NEW | YEAR");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
MyData rec1 = (MyData) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
MyData rec2 = (MyData) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(1);
@@ -65,7 +65,7 @@ public class BindyPipeDelimiterTest extends CamelTestSupport {
data.setCol3("YEAR");
template.sendBody("direct:marshal", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -80,7 +80,7 @@ public class BindyPipeDelimiterTest extends CamelTestSupport {
data.setCol3("YEAR");
template.sendBody("direct:marshal", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java
index c8b7c7046b0..49c026627e2 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java
@@ -33,7 +33,7 @@ public class BindySimpleCsvAutospanLineTest extends CamelTestSupport {
template.sendBody("direct:unmarshal", "1,hei,kommentar");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
//final List<Map<?, SpanLastRecord>> rows = CastUtils.cast(mock.getReceivedExchanges().get(0).getIn().getBody(List.class));
//final SpanLastRecord order = rows.get(0).get(SpanLastRecord.class.getName());
@@ -52,7 +52,7 @@ public class BindySimpleCsvAutospanLineTest extends CamelTestSupport {
template.sendBody("direct:unmarshal", "1,hei,kommentar,test,noe,hei");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final SpanLastRecord order = mock.getReceivedExchanges().get(0).getIn().getBody(SpanLastRecord.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java
index 12453dcaaf9..0e1b0e9d2ad 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java
@@ -58,7 +58,7 @@ public class BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest extends Camel
body.setNumber(new BigDecimal(10));
template.sendBody("direct:startMarshal1", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
BindyCsvRowFormat75191 model
= mockEndPointUnMarshal1.getReceivedExchanges().get(0).getIn().getBody(BindyCsvRowFormat75191.class);
@@ -80,7 +80,7 @@ public class BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest extends Camel
body.setNumber(new BigDecimal(10));
template.sendBody("direct:startMarshal2", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
BindyCsvRowFormat75192 model
= mockEndPointUnMarshal2.getReceivedExchanges().get(0).getIn().getBody(BindyCsvRowFormat75192.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java
index 5698ba981e1..380810653bc 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java
@@ -58,7 +58,7 @@ public class BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest extends CamelT
body.setNumber(new BigDecimal(10));
template.sendBody("direct:startMarshal1", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
BindyCsvRowFormat75191 model
= mockEndPointUnMarshal1.getReceivedExchanges().get(0).getIn().getBody(BindyCsvRowFormat75191.class);
@@ -81,7 +81,7 @@ public class BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest extends CamelT
body.setNumber(new BigDecimal(10));
template.sendBody("direct:startMarshal2", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
BindyCsvRowFormat75192 model
= mockEndPointUnMarshal2.getReceivedExchanges().get(0).getIn().getBody(BindyCsvRowFormat75192.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java
index f5d427feed1..ded11e2513b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java
@@ -58,7 +58,7 @@ public class BindySimpleCsvFunctionWithClassMethodTest extends CamelTestSupport
body.setNumber(new BigDecimal(10));
template.sendBody("direct:startMarshal1", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
BindyCsvRowFormat7621 model
= mockEndPointUnMarshal1.getReceivedExchanges().get(0).getIn().getBody(BindyCsvRowFormat7621.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java
index e0fcbfb149b..16e8da47a0e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java
@@ -62,7 +62,7 @@ public class BindySimpleCsvFunctionWithExternalMethodTest extends CamelTestSuppo
body.setNumber(new BigDecimal(10));
template.sendBody("direct:startMarshal1", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
BindyCsvRowFormat7621 model
= mockEndPointUnMarshal1.getReceivedExchanges().get(0).getIn().getBody(BindyCsvRowFormat7621.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java
index 304ed10adc9..f8c500b5595 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRegexAutospanLineTest.java
@@ -33,7 +33,7 @@ public class BindySimpleCsvRegexAutospanLineTest extends CamelTestSupport {
template.sendBody("direct:unmarshal", "1 hei kommentar");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final RegexSpanLastRecord order = mock.getReceivedExchanges().get(0).getIn().getBody(RegexSpanLastRecord.class);
@@ -49,7 +49,7 @@ public class BindySimpleCsvRegexAutospanLineTest extends CamelTestSupport {
template.sendBody("direct:unmarshal", "1 hei kommentar test noe hei");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final RegexSpanLastRecord order = mock.getReceivedExchanges().get(0).getIn().getBody(RegexSpanLastRecord.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
index f62df447e1e..304be7d4c55 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
@@ -37,7 +37,7 @@ public class BindyTabSeparatorTest extends CamelTestSupport {
template.sendBody("direct:unmarshal", "123\tCamel in Action\t2\tPlease hurry\tJane Doe\tJohn Doe\n");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
PurchaseOrder order = mock.getReceivedExchanges().get(0).getIn().getBody(PurchaseOrder.class);
@@ -64,7 +64,7 @@ public class BindyTabSeparatorTest extends CamelTestSupport {
template.sendBody("direct:marshal", order);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@SuppressWarnings("unchecked")
@@ -80,7 +80,7 @@ public class BindyTabSeparatorTest extends CamelTestSupport {
+ "456\tCamel in Action\t1\t\t\t\n",
Exchange.CONTENT_ENCODING, "iso8859-1");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<PurchaseOrder> orders = (List<PurchaseOrder>) mock.getReceivedExchanges().get(0).getIn().getBody();
PurchaseOrder order = orders.get(0);
@@ -108,7 +108,7 @@ public class BindyTabSeparatorTest extends CamelTestSupport {
template.sendBody("direct:marshal", order);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java
index ad5dc59d7c9..833739e0073 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java
@@ -39,7 +39,7 @@ public class WickedHeaderWithCommaCsvTest extends CamelTestSupport {
template.sendBody("direct:startUnmarshal", csv);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final List<WickedHeaderWithCommaCsv> wickedHeaderWithCommaCsvs
= unmarshalMock.getReceivedExchanges().get(0).getIn().getBody(List.class);
@@ -56,7 +56,7 @@ public class WickedHeaderWithCommaCsvTest extends CamelTestSupport {
template.sendBody("direct:startMarshal", wickedHeaderWithCommaCsvs);
marshalMock.expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final String result = marshalMock.getReceivedExchanges().get(0).getIn().getBody(String.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
index 557ca7797d7..1becd433f38 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
@@ -42,7 +42,7 @@ public class BindyMarshalUnmarshalWithDefaultValueTest extends CamelTestSupport
template.sendBody("direct:marshal", model);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java
index bb754ad0278..4bf4cd245b3 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java
@@ -41,7 +41,7 @@ public class BindyMarshalUnmarshalssueTest extends CamelTestSupport {
body.setDate("Wednesday November 9 2011");
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
WeatherModel model = mock.getReceivedExchanges().get(0).getIn().getBody(WeatherModel.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
index b82d2bcb2a4..3f767d2f3ca 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
@@ -41,7 +41,7 @@ public class BindyMarshalWithQuoteTest extends CamelTestSupport {
template.sendBody("direct:start", model);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
index cd7d25310a8..3d266229c90 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
@@ -41,7 +41,7 @@ public class BindyUnmarshalCommaIssueTest extends CamelTestSupport {
String body = "123,\"Wednesday November 9 2011\",\"Central California\"";
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
WeatherModel model = mock.getReceivedExchanges().get(0).getIn().getBody(WeatherModel.class);
@@ -58,7 +58,7 @@ public class BindyUnmarshalCommaIssueTest extends CamelTestSupport {
String body = "123,\"Wednesday, November 9, 2011\",\"Central California\"";
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
WeatherModel model = mock.getReceivedExchanges().get(0).getIn().getBody(WeatherModel.class);
@@ -75,7 +75,7 @@ public class BindyUnmarshalCommaIssueTest extends CamelTestSupport {
String body = "123,\"Wednesday, November 9, 2011\",\"Central California, United States\"";
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
WeatherModel model = mock.getReceivedExchanges().get(0).getIn().getBody(WeatherModel.class);
@@ -93,7 +93,7 @@ public class BindyUnmarshalCommaIssueTest extends CamelTestSupport {
String body = "123,'Wednesday, November 9, 2011','Central California, United States'";
template.sendBody("direct:start", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
WeatherModel model = (WeatherModel) map.values().iterator().next();
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
index c5dd7622934..035b6f918d8 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
@@ -58,7 +59,7 @@ public class BindySimpleFixedLengthMarshallWithClipAndTrimTest extends CamelTest
template.sendBody("direct:start", generateModel());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
public List<Map<String, Object>> generateModel() {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
index a946de4ce5e..3ab1e8c7ad1 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
@@ -58,7 +59,7 @@ public class BindySimpleFixedLengthMarshallWithClipTest extends CamelTestSupport
template.sendBody("direct:start", generateModel());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
public List<Map<String, Object>> generateModel() {
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java
index 49f5526ad7c..cfc6e204f94 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchProducerTest.java
@@ -53,7 +53,7 @@ public class CaffeineCacheFromScratchProducerTest extends CamelTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET)
.withHeader(CaffeineConstants.KEY, key).withBody(val).to("direct://get-1").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerCacheNameTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerCacheNameTest.java
index 4133da45088..29939dfec20 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerCacheNameTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerCacheNameTest.java
@@ -29,7 +29,7 @@ public class CaffeineCacheProducerCacheNameTest extends CaffeineCacheTestSupport
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
index 698ac738557..ec2e54481c8 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java
@@ -41,7 +41,7 @@ public class CaffeineCacheProducerMultiOperationSameCacheTest extends CaffeineCa
mock1.expectedHeaderReceived(CaffeineConstants.ACTION_SUCCEEDED, true);
assertEquals("1", mock1.getExchanges().get(0).getIn().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerTest.java
index db9ac7f46da..ae5134f2cba 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerTest.java
@@ -49,7 +49,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_CLEANUP).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
@@ -93,7 +93,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
assertEquals(map.get(k), elements.get(k));
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
@@ -117,7 +117,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET)
.withHeader(CaffeineConstants.KEY, key).withBody(val).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -136,7 +136,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET_ALL)
.withHeader(CaffeineConstants.KEYS, keys).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = mock.getExchanges().get(0).getIn().getBody(Map.class);
keys.forEach(k -> {
@@ -165,7 +165,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE)
.withHeader(CaffeineConstants.KEY, key).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNull(cache.getIfPresent(key));
}
@@ -186,7 +186,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE_ALL)
.withHeader(CaffeineConstants.KEYS, keys).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = getTestCache().getAllPresent(keys);
keys.forEach(k -> {
@@ -209,7 +209,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE_ALL)
.to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(getTestCache().asMap().keySet().isEmpty());
}
@@ -230,7 +230,7 @@ public class CaffeineCacheProducerTest extends CaffeineCacheTestSupport {
final Exchange exchange = fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_AS_MAP)
.to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = exchange.getMessage().getBody(Map.class);
keys.forEach(k -> {
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheRemovalListenerProducerTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheRemovalListenerProducerTest.java
index accb622108c..975530a61b0 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheRemovalListenerProducerTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheRemovalListenerProducerTest.java
@@ -48,7 +48,7 @@ public class CaffeineCacheRemovalListenerProducerTest extends CaffeineCacheTestS
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_CLEANUP).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
@@ -92,7 +92,7 @@ public class CaffeineCacheRemovalListenerProducerTest extends CaffeineCacheTestS
assertEquals(map.get(k), elements.get(k));
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
@@ -116,7 +116,7 @@ public class CaffeineCacheRemovalListenerProducerTest extends CaffeineCacheTestS
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET)
.withHeader(CaffeineConstants.KEY, key).withBody(val).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -135,7 +135,7 @@ public class CaffeineCacheRemovalListenerProducerTest extends CaffeineCacheTestS
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET_ALL)
.withHeader(CaffeineConstants.KEYS, keys).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = mock.getExchanges().get(0).getIn().getBody(Map.class);
keys.forEach(k -> {
@@ -164,7 +164,7 @@ public class CaffeineCacheRemovalListenerProducerTest extends CaffeineCacheTestS
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE)
.withHeader(CaffeineConstants.KEY, key).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNull(cache.getIfPresent(key));
}
@@ -185,7 +185,7 @@ public class CaffeineCacheRemovalListenerProducerTest extends CaffeineCacheTestS
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE_ALL)
.withHeader(CaffeineConstants.KEYS, keys).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = getTestRemovalListenerCache().getAllPresent(keys);
keys.forEach(k -> {
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareOffTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareOffTest.java
index 3c45eea028f..3ba0ee45172 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareOffTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareOffTest.java
@@ -33,7 +33,7 @@ public class CaffeineSendDynamicAwareOffTest extends CaffeineCacheTestSupport {
template.sendBodyAndHeaders("direct:start", "Hello World",
Map.of("action1", "PUT", "action2", "GET", "myKey", "foobar"));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// there are 2 caffeine endpoints
int count = (int) context.getEndpoints().stream()
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareTest.java
index 5e8798df4a3..62ec4817aa3 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineSendDynamicAwareTest.java
@@ -33,7 +33,7 @@ public class CaffeineSendDynamicAwareTest extends CaffeineCacheTestSupport {
template.sendBodyAndHeaders("direct:start", "Hello World",
Map.of("action1", "PUT", "action2", "GET", "myKey", "foobar"));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// there are 1 caffeine endpoints
int count = (int) context.getEndpoints().stream()
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java
index c4cb3829dc6..1ee61797c68 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java
@@ -41,7 +41,7 @@ public class CaffeineLoadCacheProducerMultiOperationSameCacheTest extends Caffei
mock1.expectedHeaderReceived(CaffeineConstants.ACTION_SUCCEEDED, true);
assertEquals("1", mock1.getExchanges().get(0).getIn().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerTest.java
index 18507db2345..3a052246656 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerTest.java
@@ -50,7 +50,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_CLEANUP).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
@@ -97,7 +97,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
assertEquals(map.get(k), elements.get(k));
});
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
@@ -118,7 +118,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET)
.withHeader(CaffeineConstants.KEY, key).withBody(val).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -140,7 +140,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET_ALL)
.withHeader(CaffeineConstants.KEYS, keys).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = mock.getExchanges().get(0).getIn().getBody(Map.class);
keys.forEach(k -> {
@@ -169,7 +169,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE)
.withHeader(CaffeineConstants.KEY, key).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNull(cache.getIfPresent(key));
}
@@ -193,7 +193,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE_ALL)
.withHeader(CaffeineConstants.KEYS, keys).to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = getTestCache().getAllPresent(keys);
keys.forEach(k -> {
@@ -219,7 +219,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_INVALIDATE_ALL)
.to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(getTestCache().asMap().keySet().isEmpty());
}
@@ -244,7 +244,7 @@ public class CaffeineLoadCacheProducerTest extends CaffeineLoadCacheTestSupport
final Exchange exchange = fluentTemplate().withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_AS_MAP)
.to("direct://start").send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = exchange.getMessage().getBody(Map.class);
keys.forEach(k -> {
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
index c34e653b03a..ed839516f07 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
@@ -121,7 +121,7 @@ public class CaffeineIdempotentRepositoryTest extends CamelTestSupport {
template.sendBodyAndHeader("direct://in", "b", "messageId", key02);
template.sendBodyAndHeader("direct://in", "c", "messageId", key01);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
index 720089d8d0d..5d33fe610db 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
@@ -44,7 +44,7 @@ public class CassandraComponentConsumerIT extends BaseCassandra {
}
});
mock.await(1, TimeUnit.SECONDS);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -59,7 +59,7 @@ public class CassandraComponentConsumerIT extends BaseCassandra {
}
});
mock.await(1, TimeUnit.SECONDS);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -75,7 +75,7 @@ public class CassandraComponentConsumerIT extends BaseCassandra {
});
mock.await(1, TimeUnit.SECONDS);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentResumeStrategyIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentResumeStrategyIT.java
index cbae2c98cc7..6388bbe87ae 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentResumeStrategyIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentResumeStrategyIT.java
@@ -64,7 +64,7 @@ public class CassandraComponentResumeStrategyIT extends BaseCassandra {
}
});
mock.await(1, TimeUnit.SECONDS);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(resumeStrategy.resumeActionNotNull);
assertTrue(resumeStrategy.resumeCalled);
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
index 58f6c16da70..72bbd716a1c 100644
--- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
@@ -43,7 +43,7 @@ public class CBORMarshalAllowJMSTypeTest extends CamelTestSupport {
byte[] payload = objectMapper.writeValueAsBytes(author);
template.sendBodyAndHeader("direct:backPojo", payload, "JMSType", Author.class.getName());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Author pojo = mock.getReceivedExchanges().get(0).getIn().getBody(Author.class);
assertNotNull(pojo);
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
index bedc3cf64c8..c368f2cb1d5 100644
--- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -48,7 +49,7 @@ public class CBORObjectListSplitTest extends CamelTestSupport {
byte[] payload = objectMapper.writeValueAsBytes(list);
template.sendBody("direct:start", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java b/components/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
index 8fdfcdbfc5c..6a2b67cc17b 100644
--- a/components/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
+++ b/components/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
@@ -43,7 +43,7 @@ public class ChatScriptComponentIT extends CamelTestSupport {
public void testChatScript() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- Awaitility.await().atMost(Duration.ofSeconds(2)).untilAsserted(() -> assertMockEndpointsSatisfied());
+ Awaitility.await().atMost(Duration.ofSeconds(2)).untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java
index 584f5ca8ebc..fd21007acd0 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentLayersTest.java
@@ -49,7 +49,7 @@ public class ChunkComponentLayersTest extends CamelTestSupport {
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java
index 04eb987c54d..cbd4ec49936 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedLayersTest.java
@@ -50,7 +50,7 @@ public class ChunkComponentNestedLayersTest extends CamelTestSupport {
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java
index 966a088b839..bd9083d5470 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentNestedTest.java
@@ -46,7 +46,7 @@ public class ChunkComponentNestedTest extends CamelTestSupport {
// Act
startSimpleProducerTemplate.sendBodyAndHeader("The Body", "name", "Andrew");
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java
index 9ebbdc6937c..1d1ed6b4f12 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTemplateTest.java
@@ -50,7 +50,7 @@ public class ChunkComponentTemplateTest extends CamelTestSupport {
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java
index 080d3e5d94d..2bf1ce5dadc 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkComponentTest.java
@@ -49,7 +49,7 @@ public class ChunkComponentTest extends CamelTestSupport {
// Act
startSimpleProducerTemplate.sendBodyAndHeader("The Body", "name", "Andrew");
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
/**
@@ -66,7 +66,7 @@ public class ChunkComponentTest extends CamelTestSupport {
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
/**
@@ -80,7 +80,7 @@ public class ChunkComponentTest extends CamelTestSupport {
for (int i = 0; i < messageCount; i++) {
startSimpleProducerTemplate.sendBodyAndHeader("The Body", "name", "Andrew");
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
LoggerFactory.getLogger(getClass())
.info("Chunk performance: " + stopwatch.taken() + "ms for " + messageCount + " messages");
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java
index 8437f1b205c..28b273c7601 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderAndSubfolderTest.java
@@ -49,7 +49,7 @@ public class ChunkDifferentThemeFolderAndSubfolderTest extends CamelTestSupport
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java
index 63c3d320c2b..8d1149556e1 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndExtensionTest.java
@@ -49,7 +49,7 @@ public class ChunkDifferentThemeFolderSubfolderAndExtensionTest extends CamelTes
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java
index dd15364cae2..e24506b9e0d 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderSubfolderAndLayerTest.java
@@ -49,7 +49,7 @@ public class ChunkDifferentThemeFolderSubfolderAndLayerTest extends CamelTestSup
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java
index bd3e224efff..aa55e200644 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkDifferentThemeFolderTest.java
@@ -49,7 +49,7 @@ public class ChunkDifferentThemeFolderTest extends CamelTestSupport {
// Act
startSimpleProducerTemplate.send(exchange);
// Verify
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
index 05a165a8a78..a4c229ae490 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
@@ -63,7 +63,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:start", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -71,7 +71,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
sendBodyAndHeader("direct:notruststore", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -79,7 +79,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
sendBodyAndHeader("direct:failedtrust", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -91,7 +91,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:selfsigned", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -103,7 +103,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:clientauth", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -111,7 +111,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
sendBodyAndHeader("direct:failedclientauth", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -123,7 +123,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:ciphersuites", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -136,7 +136,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:rpk", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
@@ -146,7 +146,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
sendBodyAndHeader("direct:rpknotruststore", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
@@ -156,7 +156,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
sendBodyAndHeader("direct:rpkfailedtrust", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
@@ -170,7 +170,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:rpkclientauth", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
@@ -184,7 +184,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:psk", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
@@ -198,7 +198,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:pskciphersuite", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
@@ -212,7 +212,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sendBodyAndHeader("direct:pskx509", "Camel CoAP", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java
index 6bd9ba9f30a..7e1c268a564 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java
@@ -52,7 +52,7 @@ public class CoAPComponentTest extends CoAPTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sender.sendBody("Camel CoAP");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -64,7 +64,7 @@ public class CoAPComponentTest extends CoAPTestSupport {
MediaTypeRegistry.toString(MediaTypeRegistry.APPLICATION_OCTET_STREAM));
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
tcpSender.sendBody("Camel CoAP");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPPingTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPPingTest.java
index 9b3e0052ee3..e59013abdda 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPPingTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPPingTest.java
@@ -33,7 +33,7 @@ public class CoAPPingTest extends CoAPTestSupport {
mock.expectedMinimumMessageCount(1);
mock.expectedBodiesReceived(true);
sender.sendBodyAndHeader("Hello", CoAPConstants.COAP_METHOD, CoAPConstants.METHOD_PING);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
index 95c4a916c87..08d4b9c2513 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
@@ -96,7 +96,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
mock.expectedBodiesReceived("Hello some-id: xyz");
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sender.sendBodyAndHeader("xyz", CoAPConstants.COAP_METHOD, "POST");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -106,7 +106,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
mock.expectedBodiesReceived("Hello some-id");
mock.expectedHeaderReceived(CoAPConstants.COAP_RESPONSE_CODE, CoAP.ResponseCode.CONTENT.toString());
sender.sendBody(null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
protected abstract String getProtocol();
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestVerbTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestVerbTest.java
index 94c45b7fa61..9656ce5dd41 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestVerbTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestVerbTest.java
@@ -51,7 +51,7 @@ public class CoAPRestVerbTest extends CoAPTestSupport {
CoapClient client = createClient("/users");
client.post(body, MediaTypeRegistry.APPLICATION_JSON);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -65,7 +65,7 @@ public class CoAPRestVerbTest extends CoAPTestSupport {
CoapClient client = createClient("/users/1");
client.put(body, MediaTypeRegistry.APPLICATION_JSON);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -76,7 +76,7 @@ public class CoAPRestVerbTest extends CoAPTestSupport {
CoapClient client = createClient("/users/1");
client.delete();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java
index e00a2dceadc..4ee71ac837c 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.cometd;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
@@ -43,7 +44,7 @@ public class MultipCometdProducerConsumerTest extends CamelTestSupport {
template.requestBodyAndHeader("direct:input1", person, "testHeading", "value");
template.requestBodyAndHeader("direct:input2", person, "testHeading", "value");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java
index a7d40545d7b..1ca04e841cc 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteIT.java
@@ -25,6 +25,7 @@ import com.orbitz.consul.model.agent.Registration;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
@@ -78,7 +79,7 @@ public class ConsulDefaultServiceCallRouteIT extends ConsulTestSupport {
registrations.forEach(r -> template.sendBody("direct:start", "ping"));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// *************************************************************************
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
index 33272a5468e..3698e94e08f 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
@@ -27,6 +27,7 @@ import com.orbitz.consul.model.agent.Registration;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
import org.apache.camel.Route;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.cloud.DefaultServiceCallProcessor;
import org.apache.camel.processor.ChoiceProcessor;
import org.apache.camel.processor.FilterProcessor;
@@ -96,7 +97,7 @@ public abstract class SpringConsulServiceCallRouteTest extends CamelSpringTestSu
template.sendBody("direct:start", "service-2");
template.sendBody("direct:start", "service-2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ************************************
diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
index c39cf6f0fcb..0789b40df26 100644
--- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
+++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
@@ -29,7 +29,7 @@ public class ProduceMessagesSimpleIT extends CouchbaseIntegrationTestBase {
mock.expectedMessageCount(1);
template.sendBody("direct:start", "couchbase persist");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
mock.message(0).body().equals("couchbase persist");
}
diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
index 118d8f41391..c6cc56ae9f2 100644
--- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
+++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
@@ -30,7 +30,7 @@ public class ProduceMessagesWithAutoIDIT extends CouchbaseIntegrationTestBase {
template.sendBody("direct:start", "ugol1");
template.sendBody("direct:start", "ugol2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
index 702385babff..e2f21d1727d 100644
--- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
+++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
@@ -40,7 +40,7 @@ public class RemoveMessagesIT extends CouchbaseIntegrationTestBase {
template.sendBodyAndHeader("direct:start", "delete the document ", HEADER_ID, "DocumentID_1");
template.sendBodyAndHeader("direct:start", "delete the document", HEADER_ID, "DocumentID_2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 9015c6a8c72..3ddc42949cb 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -99,7 +99,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
setupMock();
sendBody("direct:ecdsa-sha1", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private MockEndpoint setupMock() {
@@ -126,7 +126,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
} else {
template.sendBodyAndHeaders("direct:in", payload, headers);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(ECDSASignatureTest.this.context);
return mock.getReceivedExchanges().get(0);
} finally {
context.stop();
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
index 1d6c2f39841..dd3c695ccf3 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
@@ -198,7 +198,7 @@ public class SignatureTest extends CamelTestSupport {
void testBasicSignatureRoute() throws Exception {
setupMock();
sendBody("direct:keypair", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
MockEndpoint mock = getMockEndpoint("mock:result");
Exchange e = mock.getExchanges().get(0);
@@ -210,35 +210,35 @@ public class SignatureTest extends CamelTestSupport {
void testSetAlgorithmInRouteDefinition() throws Exception {
setupMock();
sendBody("direct:algorithm", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testRSASHA1() throws Exception {
setupMock();
sendBody("direct:rsa-sha1", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testRSASHA256() throws Exception {
setupMock();
sendBody("direct:rsa-sha256", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testSetBufferInRouteDefinition() throws Exception {
setupMock();
sendBody("direct:buffersize", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testSetRandomInRouteDefinition() throws Exception {
setupMock();
sendBody("direct:random", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -246,28 +246,28 @@ public class SignatureTest extends CamelTestSupport {
assumeFalse(isJavaVendor("ibm"), "can only be run on SUN JDK");
setupMock();
sendBody("direct:provider", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testSetCertificateInRouteDefinition() throws Exception {
setupMock();
sendBody("direct:certificate", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testSetKeystoreInRouteDefinition() throws Exception {
setupMock();
sendBody("direct:keystore", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testSetKeystoreParametersInRouteDefinition() throws Exception {
setupMock();
sendBody("direct:keystoreParameters", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -278,7 +278,7 @@ public class SignatureTest extends CamelTestSupport {
template.send("direct:signature-header", signed);
assertNotNull(signed.getIn().getHeader("AnotherDigitalSignature"));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -298,7 +298,7 @@ public class SignatureTest extends CamelTestSupport {
template.send("direct:alias-verify", signed);
// START SNIPPET: alias-send
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -320,7 +320,7 @@ public class SignatureTest extends CamelTestSupport {
signed.getIn().setHeader(SIGNATURE_PUBLIC_KEY_OR_CERT, pair.getPublic());
template.send("direct:headerkey-verify", signed);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -344,15 +344,15 @@ public class SignatureTest extends CamelTestSupport {
signed.getIn().setHeader(SIGNATURE_PUBLIC_KEY_OR_CERT, certificate);
template.send("direct:headerkey-verify", signed);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
void testVerifyHeadersNotCleared() throws Exception {
setupMock();
template.requestBody("direct:headers", payload);
- assertMockEndpointsSatisfied();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
+ MockEndpoint.assertIsSatisfied(context);
MockEndpoint mock = getMockEndpoint("mock:result");
Exchange e = mock.getExchanges().get(0);
@@ -384,7 +384,7 @@ public class SignatureTest extends CamelTestSupport {
} else {
template.sendBodyAndHeaders("direct:in", payload, headers);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(SignatureTest.this.context);
return mock.getReceivedExchanges().get(0);
}
}
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
index 0a9bc471910..1b103c78190 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
@@ -92,7 +92,7 @@ public class CryptoDataFormatTest extends CamelTestSupport {
encrypted.getIn().setHeader(CryptoDataFormat.KEY, key);
template.send("direct:key-in-header-decrypt", encrypted);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange received = mock.getReceivedExchanges().get(0);
validateHeaderIsCleared(received);
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
index 116214342f9..f468ba798ee 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
@@ -200,7 +200,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
String payload = "Hi Alice, Be careful Eve is listening, signed Bob";
Map<String, Object> headers = getHeaders();
template.sendBodyAndHeaders("direct:verify_exception_sig_userids", payload, headers);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(exception, IllegalArgumentException.class, null, "No public key found for the key ID(s)");
@@ -217,7 +217,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
// the following entry is necessary for the dynamic test
headers.put(PGPKeyAccessDataFormat.KEY_USERID, "second");
template.sendBodyAndHeaders("direct:several-signer-keys", payload, headers);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(exception, IllegalArgumentException.class, null,
"No passphrase specified for signature key user ID");
@@ -235,7 +235,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mockKeyFlag = getMockEndpoint("mock:encrypted_keyflag");
mockKeyFlag.setExpectedMessageCount(1);
template.sendBody("direct:keyflag", "Test Message");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Exchange> exchanges = mockKeyFlag.getExchanges();
assertEquals(1, exchanges.size());
@@ -263,7 +263,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mockSubkey = getMockEndpoint("mock:unencrypted");
mockSubkey.expectedBodiesReceived(payload);
template.sendBody("direct:subkey", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -272,7 +272,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mockSubkey = getMockEndpoint("mock:unencrypted");
mockSubkey.expectedBodiesReceived(payload);
template.sendBody("direct:subkey", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -281,7 +281,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
template.sendBody("direct:subkeyUnmarshal", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(mock, IllegalArgumentException.class, null, "The input message body has an invalid format.");
}
@@ -294,7 +294,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
template.sendBody("direct:subkeyUnmarshal", bos.toByteArray());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(mock, IllegalArgumentException.class, null, "The input message body has an invalid format.");
}
@@ -323,7 +323,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
template.sendBody("direct:subkeyUnmarshal", bos.toByteArray());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(mock, PGPException.class, null,
"PGP message is encrypted with a key which could not be found in the Secret Keyring");
@@ -451,7 +451,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
template.sendBody("direct:subkeyUnmarshal", bos.toByteArray());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(mock, IllegalArgumentException.class, null, "The input message body has an invalid format.");
}
@@ -464,7 +464,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
template.sendBody("direct:subkey", "Test Message");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(mock, PGPException.class, null,
"PGP message contains a signature although a signature is not expected");
@@ -479,7 +479,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
template.sendBody("direct:subkey", "Test Message");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
checkThrownException(mock, PGPException.class, null,
"PGP message does not contain any signatures although a signature is expected");
@@ -497,7 +497,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint mock = getMockEndpoint("mock:unencrypted");
mock.expectedBodiesReceived(payload);
template.sendBody("direct:subkey", payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java
index 456dbbc6d8b..4de592b7d93 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.language.csimple.joor;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@ public class CSimpleBeanTest extends CamelTestSupport {
template.sendBody("direct:start", "World");
template.sendBody("direct:start", "Scott");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java
index f8e28d0f1e5..b5aed8871ec 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java
@@ -32,7 +32,7 @@ public class CSimpleDecHeaderTest extends CamelTestSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "myCounter", 123);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java
index f04904c39b5..317bf9697d6 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java
@@ -32,7 +32,7 @@ public class CSimpleIncHeaderTest extends CamelTestSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "myCounter", 123);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
index d01cb0a0d51..6c5da13a4f5 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.language.csimple.joor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -28,7 +29,7 @@ public class CSimpleSetHeaderPredicateTest extends CamelTestSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "foo", "World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -37,7 +38,7 @@ public class CSimpleSetHeaderPredicateTest extends CamelTestSupport {
template.sendBodyAndHeader("direct:start", "Hello World", "foo", "Camel");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -47,7 +48,7 @@ public class CSimpleSetHeaderPredicateTest extends CamelTestSupport {
template.sendBody("direct:other", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java
index fb2f23f37c1..6a7186b3e83 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.language.csimple.joor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -35,7 +36,7 @@ public class CSimpleTest extends CamelTestSupport {
template.sendBody("direct:start", 6);
template.sendBody("direct:start", 20);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
index ff81fce16de..0263af1a7e5 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
@@ -44,7 +44,7 @@ public class CsvMarshalPipeDelimiterSpringTest extends CamelSpringTestSupport {
template.sendBody("direct:start", createBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String body = result.getReceivedExchanges().get(0).getIn().getBody(String.class);
String[] lines = body.split(LS);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
index 0e9f946457c..303e1327c1d 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
@@ -41,7 +41,7 @@ public class CsvMarshalPipeDelimiterTest extends CamelTestSupport {
template.sendBody("direct:start", createBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String body = result.getReceivedExchanges().get(0).getIn().getBody(String.class);
String[] lines = body.split(LS);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java
index 26aaf4115c6..87f3241f3bd 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java
@@ -41,7 +41,7 @@ public class CsvUnmarshalCommentMarkerSpringTest extends CamelSpringTestSupport
template.sendBody("direct:start", "# Cool books list (comment)\n123|Camel in Action|1\n124|ActiveMQ in Action|2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java
index dea7e996623..dbfe3ce54af 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java
@@ -42,7 +42,7 @@ public class CsvUnmarshalMapLineSpringTest extends CamelSpringTestSupport {
// the first line contains the column names which we intend to skip
template.sendBody("direct:start", "OrderId|Item|Amount\n123|Camel in Action|1\n124|ActiveMQ in Action|2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Map<String, String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
@@ -61,7 +61,7 @@ public class CsvUnmarshalMapLineSpringTest extends CamelSpringTestSupport {
// the first and last line we intend to skip
template.sendBody("direct:start", "OrderId|Item|Amount\n");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<?> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(0, body.size());
@@ -74,7 +74,7 @@ public class CsvUnmarshalMapLineSpringTest extends CamelSpringTestSupport {
template.sendBody("direct:explicitHeader", "123|Camel in Action|1\n124|ActiveMQ in Action|2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Map<String, String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
@@ -93,7 +93,7 @@ public class CsvUnmarshalMapLineSpringTest extends CamelSpringTestSupport {
template.sendBody("direct:replaceHeader", "a|b|c\n123|Camel in Action|1\n124|ActiveMQ in Action|2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Map<String, String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java
index 6c0b6ddc380..636315f60c5 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java
@@ -41,7 +41,7 @@ public class CsvUnmarshalPipeDelimiterSpringTest extends CamelSpringTestSupport
template.sendBody("direct:start", "123|Camel in Action|1\n124|ActiveMQ in Action|2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java
index d0974d21411..00add6d2046 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java
@@ -41,7 +41,7 @@ public class CsvUnmarshalPipeDelimiterTest extends CamelTestSupport {
template.sendBody("direct:start", "123|Camel in Action|1\n124|ActiveMQ in Action|2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
@@ -60,7 +60,7 @@ public class CsvUnmarshalPipeDelimiterTest extends CamelTestSupport {
template.sendBody("direct:start", "123|Camel in Action|1");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(1, body.size());
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java
index b69bdb2177e..9f7f6fd4909 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java
@@ -42,7 +42,7 @@ public class CsvUnmarshalSkipFirstLineSpringTest extends CamelSpringTestSupport
// the first line contains the column names which we intend to skip
template.sendBody("direct:start", "OrderId|Item|Amount\n123|Camel in Action|1\n124|ActiveMQ in Action|2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
@@ -63,7 +63,7 @@ public class CsvUnmarshalSkipFirstLineSpringTest extends CamelSpringTestSupport
// to true the first line gets simply skipped and not unmarshalled
template.sendBody("direct:start", "124|ActiveMQ in Action|2\n123|Camel in Action|1");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(1, body.size());
@@ -79,7 +79,7 @@ public class CsvUnmarshalSkipFirstLineSpringTest extends CamelSpringTestSupport
// the first and last line we intend to skip
template.sendBody("direct:start", "123|Camel in Action|1\n");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<?> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(0, body.size());
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java
index 2df90b8de37..abfc94b6663 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java
@@ -41,7 +41,7 @@ public class CsvUnmarshalStreamSpringTest extends CamelSpringTestSupport {
template.sendBody("direct:start", CSV_SAMPLE);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List body1 = line.getExchanges().get(0).getIn().getBody(List.class);
List body2 = line.getExchanges().get(1).getIn().getBody(List.class);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java
index 1a968af5e07..76a35cc238f 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java
@@ -54,7 +54,7 @@ public class CsvUnmarshalStreamTest extends CamelTestSupport {
template.sendBody("direct:start", message);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
for (int i = 0; i < EXPECTED_COUNT; ++i) {
List<String> body = result.getReceivedExchanges().get(i)
@@ -73,7 +73,7 @@ public class CsvUnmarshalStreamTest extends CamelTestSupport {
template.sendBody("direct:start", new MyFileInputStream(new File("src/test/resources/data.csv")));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
for (int i = 0; i < EXPECTED_COUNT; ++i) {
List<String> body = result.getReceivedExchanges().get(i)
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java
index 12a2647696b..3f8d6bf170f 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java
@@ -37,7 +37,7 @@ public class CsvUnmarshalTabDelimiterSpringTest extends CamelSpringTestSupport {
template.sendBody("direct:start", "123\tCamel in Action\t1\n124\tActiveMQ in Action\t2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
@@ -56,7 +56,7 @@ public class CsvUnmarshalTabDelimiterSpringTest extends CamelSpringTestSupport {
template.sendBody("direct:start", "123\tCamel in Action\t1");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(1, body.size());
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java
index f59813a54f0..991bd804dc1 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java
@@ -38,7 +38,7 @@ public class CsvUnmarshalTabDelimiterTest extends CamelTestSupport {
template.sendBody("direct:start", "123\tCamel in Action\t1\n124\tActiveMQ in Action\t2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, body.size());
@@ -57,7 +57,7 @@ public class CsvUnmarshalTabDelimiterTest extends CamelTestSupport {
template.sendBody("direct:start", "123\tCamel in Action\t1");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<List<String>> body = result.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(1, body.size());
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
index 6b50d12a2b8..6664d7cbdde 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
@@ -51,7 +51,7 @@ public class CsvUnmarshalTwoCsvDataFormatConcurrentTest extends CamelTestSupport
template.sendBody("direct:start", "123" + delimiter + "Camel in Action" + delimiter + "1\n124" + delimiter
+ "ActiveMQ in Action" + delimiter + "2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
@SuppressWarnings("unchecked")
List<List<String>> body = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
index 955a28dc54c..06c28bdf89b 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
@@ -69,7 +70,7 @@ public class CxfRsProducerEndpointConfigurerTest extends CamelTestSupport {
});
getMockEndpoint("mock:result").expectedHeaderReceived("foo", "bar");
getMockEndpoint("mock:end").expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -84,7 +85,7 @@ public class CxfRsProducerEndpointConfigurerTest extends CamelTestSupport {
});
getMockEndpoint("mock:result").expectedHeaderReceived("foo", "bar");
getMockEndpoint("mock:end").expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
public static class MyCxfRsConfigurer implements CxfRsConfigurer {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java
index 84d020fb909..1e6f152381f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfMultipleConsumersSupportTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.jaxws;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -79,7 +80,7 @@ public class CxfMultipleConsumersSupportTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderViaCamelHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
index ceacbebfb1d..ad43d222c9b 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
@@ -73,7 +73,7 @@ public class CxfPayLoadSoapHeaderViaCamelHeaderTest extends CxfPayLoadSoapHeader
MockEndpoint mock = getMockEndpoint("mock:end");
mock.expectedMessageCount(1);
sendBody("direct:start", body);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Document message = mock.getExchanges().get(0).getIn().getMandatoryBody(Document.class);
Element root = message.getDocumentElement();
NodeList nodeList = root.getElementsByTagName("MinutesUntilReady");
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java
index 8b93e7daf17..7ca8688cda9 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSessionTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.base.cookie.ExchangeCookieHandler;
import org.apache.camel.http.base.cookie.InstanceCookieHandler;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -90,7 +91,7 @@ public class CxfProducerSessionTest extends CamelTestSupport {
assertEquals("New New World", response);
response = template.requestBody("direct:start", "World", String.class);
assertEquals("New New World", response);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -100,7 +101,7 @@ public class CxfProducerSessionTest extends CamelTestSupport {
assertEquals("Old New World", response);
response = template.requestBody("direct:exchange", "World", String.class);
assertEquals("Old New World", response);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -110,7 +111,7 @@ public class CxfProducerSessionTest extends CamelTestSupport {
assertEquals("Old New World", response);
response = template.requestBody("direct:instance", "World", String.class);
assertEquals("Old Old World", response);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java
index 8743b054ec7..3b61dd0b48c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousFalseTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.cxf.BusFactory;
import org.apache.cxf.frontend.ServerFactoryBean;
@@ -65,7 +66,7 @@ public class CxfProducerSynchronousFalseTest extends CamelTestSupport {
assertTrue(response.indexOf("echo " + TEST_MESSAGE) > 0, "It should has the echo message");
assertTrue(response.indexOf("echoResponse") > 0, "It should has the echoResponse tag");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java
index 246e8a888fe..af1c3313abd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSynchronousTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.cxf.BusFactory;
import org.apache.cxf.frontend.ServerFactoryBean;
@@ -65,7 +66,7 @@ public class CxfProducerSynchronousTest extends CamelTestSupport {
assertTrue(response.indexOf("echo " + TEST_MESSAGE) > 0, "It should has the echo message");
assertTrue(response.indexOf("echoResponse") > 0, "It should has the echoResponse tag");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should use same threads");
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfRawMessageRouterTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfRawMessageRouterTest.java
index d8781d8b8ac..e2929bdbc3a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfRawMessageRouterTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfRawMessageRouterTest.java
@@ -52,7 +52,7 @@ public class CxfRawMessageRouterTest extends CxfSimpleRouterTest {
result.expectedMessageCount(1);
HelloService client = getCXFClient();
client.echo("hello world");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Map<?, ?> context
= CastUtils.cast((Map<?, ?>) result.assertExchangeReceived(0).getIn().getHeaders().get("ResponseContext"));
Map<?, ?> protocalHeaders = CastUtils.cast((Map<?, ?>) context.get("org.apache.cxf.message.Message.PROTOCOL_HEADERS"));
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java
index 90677d6564c..931ea86b8ca 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java
@@ -75,7 +75,7 @@ public class SplitterWithXqureyTest extends CamelTestSupport {
result.reset();
result.expectedMessageCount(4);
template.sendBody("direct:endpoint", xmlData);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
int i = 0;
for (Exchange exchange : result.getExchanges()) {
Element element = (Element) exchange.getIn().getBody();
@@ -93,7 +93,7 @@ public class SplitterWithXqureyTest extends CamelTestSupport {
result.reset();
result.expectedMessageCount(4);
template.sendBody("direct:toString", xmlData);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
int i = 0;
for (Exchange exchange : result.getExchanges()) {
String message = exchange.getIn().getBody(String.class);
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
index 1fe4204f5fb..453c4bc17b1 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
@@ -87,7 +87,7 @@ public class CxfOneWayRouteTest extends CamelSpringTestSupport {
Thread.sleep(1000);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(onCompeletedCalled, "UnitOfWork done should be called");
assertNull(bindingException, "exception occured: " + bindingException);
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
index 995da92a696..058279eb2e5 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
@@ -81,7 +81,7 @@ public class FileToCxfMessageDataFormatTest extends CamelSpringTestSupport {
template.sendBodyAndHeader("file:target/filetocxf", createBody(), Exchange.FILE_NAME, "payload.xml");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String out = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
assertNotNull(out);
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
index 96524588824..17b357dc65f 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
@@ -134,7 +134,7 @@ public class CamelConduitTest extends CamelTransportTestSupport {
Message message = new MessageImpl();
// set the isOneWay to be true
sendoutMessage(conduit, message, true, "HelloWorld");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// verify the endpoint get the response
}
@@ -148,7 +148,7 @@ public class CamelConduitTest extends CamelTransportTestSupport {
// set the isOneWay to be false
sendoutMessage(conduit, message, false, "HelloWorld");
// verify the endpoint get the response
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
verifyReceivedMessage("HelloWorld");
}
diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java
index dd71cdaa134..c8891ebab53 100644
--- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java
+++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java
@@ -56,7 +56,7 @@ public class DigitalOceanComponentTest extends CamelTestSupport {
mockResultEndpoint.expectedMinimumMessageCount(1);
Exchange exchange = template.request("direct:getAccountInfo", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertIsInstanceOf(Account.class, exchange.getMessage().getBody());
assertEquals("camel@apache.org", exchange.getMessage().getBody(Account.class).getEmail());
}
diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java
index 89a0d050722..71f8402f3b0 100644
--- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java
+++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java
@@ -188,7 +188,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
exchange = template.request("direct:getAccountInfo2", null);
assertTrue(((Account) exchange.getMessage().getBody()).isEmailVerified());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@@ -198,7 +198,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getActions", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(30, ((List) exchange.getMessage().getBody()).size());
}
@@ -208,7 +208,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getActionInfo", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(((Action) exchange.getMessage().getBody()).getId(), Integer.valueOf(133459716));
}
@@ -222,7 +222,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
exchange = template.request("direct:getDroplet2", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(((Droplet) exchange.getMessage().getBody()).getId(), Integer.valueOf(5428878));
}
@@ -233,7 +233,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:createDroplet", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Droplet droplet = (Droplet) exchange.getMessage().getBody();
assertNotNull(droplet.getId());
@@ -248,7 +248,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:createMultipleDroplets", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Droplet> droplets = (List<Droplet>) exchange.getMessage().getBody();
assertCollectionSize(droplets, 2);
@@ -260,7 +260,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getDroplets", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(1, ((List) exchange.getMessage().getBody()).size());
}
@@ -270,7 +270,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getDropletBackups", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertCollectionSize((List) exchange.getMessage().getBody(), 0);
}
@@ -280,7 +280,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:createTag", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals("tag1", ((Tag) exchange.getMessage().getBody()).getName());
}
@@ -290,7 +290,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getTags", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals("tag1", ((List<Tag>) exchange.getMessage().getBody()).get(0).getName());
}
@@ -300,7 +300,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getImages", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Image> images = (List<Image>) exchange.getMessage().getBody();
assertNotEquals(1, images.size());
}
@@ -311,7 +311,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getImage", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals("ubuntu-14-04-x64", (exchange.getMessage().getBody(Image.class)).getSlug());
}
@@ -322,7 +322,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getSizes", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Size> sizes = (List<Size>) exchange.getMessage().getBody();
System.out.println(sizes);
assertNotEquals(1, sizes.size());
@@ -334,7 +334,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport {
Exchange exchange = template.request("direct:getRegions", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<Region> regions = (List<Region>) exchange.getMessage().getBody();
System.out.println(regions);
assertNotEquals(1, regions.size());
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java
index 08b865933b1..eaf3ef15f1d 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -37,7 +38,7 @@ public class DirectRequestReplyAndDisruptorInOnlyTest extends CamelTestSupport {
assertEquals("Bye World", out);
LOG.info("Got reply " + out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java
index a7b9278a9f8..36018f83788 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorAsyncRouteTest.java
@@ -37,7 +37,7 @@ public class DisruptorAsyncRouteTest extends CamelTestSupport {
assertEquals("OK", out);
// END SNIPPET: e2
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java
index e5bdc00017d..a7d2031c01a 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBlockWhenFullTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -56,7 +57,7 @@ public class DisruptorBlockWhenFullTest extends CamelTestSupport {
assertEquals(QUEUE_SIZE, disruptor.getRemainingCapacity());
sendSoManyOverCapacity(DEFAULT_URI, QUEUE_SIZE, 20);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java
index 1159e723fd9..0d3430f98a0 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorComplexInOutTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -30,7 +31,7 @@ public class DisruptorComplexInOutTest extends CamelTestSupport {
final String out = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java
index 3aaa4ee4091..a80ece8046d 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersNPEIssueTest.java
@@ -34,7 +34,7 @@ public class DisruptorConcurrentConsumersNPEIssueTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
RouteController routeController = context.getRouteController();
Exception ex = assertThrows(FailedToStartRouteException.class,
@@ -52,7 +52,7 @@ public class DisruptorConcurrentConsumersNPEIssueTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// this should be okay
context.getRouteController().startRoute("third");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java
index 6f7500056fa..b3980b32964 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentConsumersTest.java
@@ -29,7 +29,7 @@ public class DisruptorConcurrentConsumersTest extends CamelTestSupport {
template.sendBody("disruptor:foo?concurrentConsumers=5", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
index a7698db974a..8adee44e255 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
@@ -46,7 +46,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Message " + i);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -61,7 +61,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
template.asyncSendBody("disruptor:foo", "Message " + i);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -86,7 +86,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
replies.add(out);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(20, replies.size());
executors.shutdownNow();
@@ -113,7 +113,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
replies.add(out);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals(20, replies.size());
for (int i = 0; i < 20; i++) {
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java
index d8c1d42145e..90821dacf63 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorFromRouteIdTest.java
@@ -37,7 +37,7 @@ public class DisruptorFromRouteIdTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertEquals("foo", foo.getReceivedExchanges().get(0).getFromRouteId());
assertEquals("disruptor://foo", foo.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java
index 1283f76404d..0f20bdb89d8 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyChainedTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -29,7 +30,7 @@ public class DisruptorInOnlyChainedTest extends CamelTestSupport {
template.sendBody("disruptor:a", "start");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java
index 91b8647b72d..fce36fb224f 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOnlyTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -27,7 +28,7 @@ public class DisruptorInOnlyTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java
index 5514879306a..f35d43e227f 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutBigChainedTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -37,7 +38,7 @@ public class DisruptorInOutBigChainedTest extends CamelTestSupport {
final String reply = template.requestBody("disruptor:a", "start", String.class);
assertEquals("start-a-b-c-d-e-f-g-h", reply);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java
index 721863651b1..5171b61d0a7 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -32,7 +33,7 @@ public class DisruptorInOutChainedTest extends CamelTestSupport {
final String reply = template.requestBody("disruptor:a", "start", String.class);
assertEquals("start-a-b-c", reply);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java
index 06567853ff5..a7eab138ca0 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutChainedWithOnCompletionTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -37,7 +38,7 @@ public class DisruptorInOutChainedWithOnCompletionTest extends CamelTestSupport
final String reply = template.requestBody("disruptor:a", "start", String.class);
assertEquals("start-a-b-c", reply);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java
index 04251ff678f..197cc834a33 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -30,7 +31,7 @@ public class DisruptorInOutTest extends CamelTestSupport {
final String out = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java
index ad66ee1bbf8..bb3739a9359 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -28,7 +29,7 @@ public class DisruptorInOutWithErrorDeadLetterChannelTest extends CamelTestSuppo
template.requestBody("direct:start", "Hello World", String.class);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java
index 43645203d8e..8ee9defcba0 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorInOutWithErrorTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.disruptor;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -38,7 +39,7 @@ public class DisruptorInOutWithErrorTest extends CamelTestSupport {
assertEquals("Damn I cannot do this", e.getCause().getMessage());
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
index 93dc6013573..ecf5eed02e1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -29,7 +30,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Hello World");
template.sendBody("disruptor:bar", "Bye World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -41,7 +42,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Hello World");
template.sendBody("disruptor:bar", "Bye World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
context.addRoutes(new RouteBuilder() {
@Override
@@ -61,7 +62,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Hello World");
template.sendBody("disruptor:bar", "Bye World");
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
resetMocks();
context.getRouteController().suspendRoute("testRoute");
@@ -73,7 +74,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
template.sendBody("disruptor:foo", "Hello World");
template.sendBody("disruptor:bar", "Bye World");
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java
index bf60743d518..4178200efd7 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorReconfigureWithBlockingProducerTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -57,7 +58,7 @@ public class DisruptorReconfigureWithBlockingProducerTest extends CamelTestSuppo
//Wait and check that the producer has produced all messages without throwing an exception
assertTrue(producerThread.checkResult());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
index 9139c0c0d97..0a8217fe7c7 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
@@ -40,7 +40,7 @@ public class DisruptorShouldNotUseSameThreadTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java
index 0eae7fe8e65..cbd8e584001 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorTimeoutTest.java
@@ -42,7 +42,7 @@ public class DisruptorTimeoutTest extends CamelTestSupport {
final Future<String> out = template.asyncRequestBody("disruptor:foo", "World", String.class);
assertEquals("Bye World", out.get());
result.await(1, TimeUnit.SECONDS);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -64,7 +64,7 @@ public class DisruptorTimeoutTest extends CamelTestSupport {
//we can't remove the exchange from a Disruptor once it is published, but it should never reach the
//mock:result endpoint because it should be filtered out by the DisruptorConsumer
result.await(1, TimeUnit.SECONDS);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java
index a5f57c654d5..a48dff94fd6 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorUnitOfWorkTest.java
@@ -46,7 +46,7 @@ public class DisruptorUnitOfWorkTest extends CamelTestSupport {
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
notify.matchesWaitTime();
assertEquals("onCompleteA", sync);
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java
index 800bc4b3835..4a6d2f9dc96 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskAsPropertyTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.WaitForTaskToComplete;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -41,7 +42,7 @@ public class DisruptorWaitForTaskAsPropertyTest extends CamelTestSupport {
});
assertEquals("Bye World", out.getMessage().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -62,7 +63,7 @@ public class DisruptorWaitForTaskAsPropertyTest extends CamelTestSupport {
// Should return the in message as no reply is expected
assertEquals("Hello World", out.getMessage().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java
index aa4f9fb613d..8b8b1add1a3 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteOnCompletionTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -45,7 +46,7 @@ public class DisruptorWaitForTaskCompleteOnCompletionTest extends CamelTestSuppo
assertEquals("Forced", e.getCause().getMessage());
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// 3 + 1 C and A should be last
assertEquals("CCCCA", done);
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java
index 76375c15032..d027647a2e5 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskCompleteTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@ public class DisruptorWaitForTaskCompleteTest extends CamelTestSupport {
final String out = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -51,7 +52,7 @@ public class DisruptorWaitForTaskCompleteTest extends CamelTestSupport {
});
assertEquals("Bye World", out.getIn().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java
index 102b308eaad..2be4d0465bc 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -32,7 +33,7 @@ public class DisruptorWaitForTaskIfReplyExpectedTest extends CamelTestSupport {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
final String out = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@@ -53,7 +54,7 @@ public class DisruptorWaitForTaskIfReplyExpectedTest extends CamelTestSupport {
// Should return the in message as no reply is expected
assertEquals("Hello World", out.getMessage().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java
index 32a2ff16102..53e0e51a71c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -43,7 +44,7 @@ public class DisruptorWaitForTaskNeverOnCompletionTest extends CamelTestSupport
template.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(latch.await(5, TimeUnit.SECONDS));
// B should be first because we do not wait
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java
index 4454007a633..aeae9eba68c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitForTaskNeverTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -34,7 +35,7 @@ public class DisruptorWaitForTaskNeverTest extends CamelTestSupport {
// we do not wait for the response so we just get our own input back
assertEquals("Hello World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -54,7 +55,7 @@ public class DisruptorWaitForTaskNeverTest extends CamelTestSupport {
// Should return the in message as no reply is expected
assertEquals("Hello World", out.getMessage().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
index 09d22306f33..984c57e29ff 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
@@ -64,7 +64,7 @@ public class FileDisruptorShutdownCompleteAllTasksTest extends CamelTestSupport
final MockEndpoint bar = getMockEndpoint("mock:bar");
bar.expectedMinimumMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// shutdown during processing
context.stop();
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
index d00f5f4ef66..48a956ed34c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
@@ -29,7 +29,7 @@ public class DisruptorVmConcurrentConsumersTest extends AbstractVmTestSupport {
template2.sendBody("disruptor-vm:foo?concurrentConsumers=5", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java
index 54c96e0ebb7..870d852ccac 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java
@@ -31,7 +31,7 @@ public class DisruptorVmDifferentOptionsOnConsumerAndProducerTest extends Abstra
template2.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// check the camel context of the exchange
assertEquals(context, result.getExchanges().get(0).getContext(), "Got a wrong context.");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
index 1e9cf8c2e0b..972bfd74c8c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
@@ -32,7 +32,7 @@ public class DisruptorVmInOnlyChainedTest extends AbstractVmTestSupport {
template.sendBody("disruptor-vm:a", "start");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
MockEndpoint.assertIsSatisfied(context2);
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
index 0bf1b6cdab5..e02da6adc75 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class DisruptorVmInOnlyTest extends AbstractVmTestSupport {
@@ -27,7 +28,7 @@ public class DisruptorVmInOnlyTest extends AbstractVmTestSupport {
template2.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
index 1e8a975f938..efac27b91d7 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
@@ -34,7 +34,7 @@ public class DisruptorVmInOutChainedTest extends AbstractVmTestSupport {
String reply = template2.requestBody("disruptor-vm:a", "start", String.class);
assertEquals("start-a-b-c", reply);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
index 80ba607c92f..d28f8bf144f 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor.vm;
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;
@@ -30,7 +31,7 @@ public class DisruptorVmInOutTest extends AbstractVmTestSupport {
String out = template2.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
index d7fb3fd0a2a..f628cf14a05 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.CamelExecutionException;
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;
@@ -38,7 +39,7 @@ public class DisruptorVmInOutWithErrorTest extends AbstractVmTestSupport {
assertEquals("Damn I cannot do this", e.getCause().getMessage());
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
index 8de6905d884..aa41f54c1b4 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.disruptor.vm;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -37,7 +38,7 @@ public class DisruptorVmMultipleConsumersIssueTest extends CamelTestSupport {
template.sendBody("direct:inbox", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
index d17bf078e9f..510951cd7e8 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
@@ -40,7 +40,7 @@ public class DisruptorVmShouldNotUseSameThreadTest extends AbstractVmTestSupport
template2.sendBody("direct:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
index a23a1da6aa8..dd64851a335 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
@@ -36,7 +36,7 @@ public class DisruptorVmSplitterTest extends AbstractVmTestSupport {
template2.sendBody("direct:start", "Claus@James@Willem");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
index 6b7c7ceca81..3b5b7c1eb1c 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class DisruptorVmUseSameQueueTest extends AbstractVmTestSupport {
@@ -28,7 +29,7 @@ public class DisruptorVmUseSameQueueTest extends AbstractVmTestSupport {
template2.sendBody("direct:start", "Hello World");
template2.sendBody("direct:start", "Bye World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
index b116390be42..0332af0feff 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
@@ -33,7 +34,7 @@ public class DisruptorVmWaitForTaskCompleteTest extends AbstractVmTestSupport {
String out = template2.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -50,7 +51,7 @@ public class DisruptorVmWaitForTaskCompleteTest extends AbstractVmTestSupport {
});
assertEquals("Bye World", out.getIn().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
index 94cd5e7a70d..1c4d3b3bd9e 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
@@ -33,7 +34,7 @@ public class DisruptorVmWaitForTaskIfReplyExpectedTest extends AbstractVmTestSup
String out = template2.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -52,7 +53,7 @@ public class DisruptorVmWaitForTaskIfReplyExpectedTest extends AbstractVmTestSup
// Should return the in message as no reply is expected
assertEquals("Hello World", out.getMessage().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
index 994abebff0d..6d9386055c2 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
@@ -34,7 +35,7 @@ public class DisruptorVmWaitForTaskNewerTest extends AbstractVmTestSupport {
// we do not wait for the response so we just get our own input back
assertEquals("Hello World", out);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -53,7 +54,7 @@ public class DisruptorVmWaitForTaskNewerTest extends AbstractVmTestSupport {
// Should return the in message as no reply is expected
assertEquals("Hello World", out.getMessage().getBody());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
index 018dd79931e..58bfade36a0 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
@@ -67,7 +67,7 @@ public class DozerTypeConverterDTOTest extends CamelTestSupport {
template.sendBody("direct:service-in", createDtoCustomer());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
index 6132a833e2b..9679fe65978 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
@@ -60,7 +60,7 @@ public class DozerTypeConverterTest extends CamelTestSupport {
template.sendBody("direct:service-in", createServiceCustomer());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java
index 3be72ff934b..eb10c7a0a32 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java
@@ -38,6 +38,6 @@ public class SpringDozerTypeConverterConfigurationTest extends CamelSpringTestSu
template.sendBody("direct:service-in", createServiceCustomer());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java
index b85818fcb71..f3d06ced805 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java
@@ -38,6 +38,6 @@ public class SpringDozerTypeConverterTest extends CamelSpringTestSupport {
template.sendBody("direct:service-in", createServiceCustomer());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java
index 1d75d9e902a..8367af16b42 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java
@@ -38,6 +38,6 @@ public class SpringDozerTypeConverterWithMapIdTest extends CamelSpringTestSuppor
template.sendBody("direct:service-in", createServiceCustomer());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
}
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelIT.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelIT.java
index 0678c5f814e..2c9a6e79c51 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelIT.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelIT.java
@@ -52,7 +52,7 @@ public class DropboxProducerDelIT extends DropboxTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
mock.expectedHeaderReceived(DropboxResultHeader.DELETED_PATH.name(), workdir + "/" + FILE_NAME);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveIT.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveIT.java
index 9dac8c59de4..b40da86d584 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveIT.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveIT.java
@@ -56,7 +56,7 @@ public class DropboxProducerMoveIT extends DropboxTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
mock.expectedHeaderReceived(DropboxResultHeader.MOVED_PATH.name(), workdir + "/" + FILE);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
index 7f0f9c5aa06..f869ce66e88 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
@@ -93,7 +93,7 @@ public class DropboxProducerPutSingleFileIT extends DropboxTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
mock.expectedHeaderReceived(DropboxResultHeader.UPLOADED_FILE.name(), workdir + "/" + FILENAME);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConsumerTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConsumerTest.java
index 1907bce7490..a296dfb638e 100644
--- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConsumerTest.java
+++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConsumerTest.java
@@ -51,7 +51,7 @@ public class EhcacheConsumerTest extends EhcacheTestSupport {
cache.put(key, values[0]);
cache.put(key, values[1]);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheProducerTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheProducerTest.java
index 1f1e3feb650..03d21fdd39d 100644
--- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheProducerTest.java
+++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheProducerTest.java
@@ -48,7 +48,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
@@ -74,7 +74,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(cache.containsKey(key));
assertEquals(val, cache.get(key));
@@ -96,7 +96,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
map.forEach((k, v) -> {
assertTrue(cache.containsKey(k));
@@ -131,7 +131,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(cache.containsKey(key));
assertEquals(val1, cache.get(key));
@@ -162,7 +162,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -184,7 +184,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
final Map<String, String> elements = mock.getExchanges().get(0).getIn().getBody(Map.class);
keys.forEach(k -> {
@@ -216,7 +216,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertFalse(cache.containsKey(key));
}
@@ -251,7 +251,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertFalse(cache.containsKey(key));
}
@@ -275,7 +275,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
.to("direct://start")
.send();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
cache.forEach(e -> assertFalse(keys.contains(e.getKey())));
}
@@ -330,7 +330,7 @@ public class EhcacheProducerTest extends EhcacheTestSupport {
assertEquals(val3, cache.get(key));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
// ****************************
diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/idempotent/EhcacheIdempotentRepositoryTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/idempotent/EhcacheIdempotentRepositoryTest.java
index f2d592043da..f78afa624a7 100644
--- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/idempotent/EhcacheIdempotentRepositoryTest.java
+++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/idempotent/EhcacheIdempotentRepositoryTest.java
@@ -122,7 +122,7 @@ public class EhcacheIdempotentRepositoryTest extends EhcacheTestSupport {
template.sendBodyAndHeader("direct://in", "b", "messageId", key02);
template.sendBodyAndHeader("direct://in", "c", "messageId", key01);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/AggregateEtcd3ManualTest.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/AggregateEtcd3ManualTest.java
index 5a14c95bbb1..030e50bc5bd 100644
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/AggregateEtcd3ManualTest.java
+++ b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/AggregateEtcd3ManualTest.java
@@ -39,7 +39,7 @@ class AggregateEtcd3ManualTest extends Etcd3TestSupport {
template.sendBodyAndHeader("direct:start", "B", "myId", 1);
template.sendBodyAndHeader("direct:start", "F", "myId", 2);
template.sendBodyAndHeader("direct:start", "C", "myId", 1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyIT.java b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyIT.java
index 9236887a98e..cbc7beb717d 100644
--- a/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyIT.java
+++ b/components/camel-etcd3/src/test/java/org/apache/camel/component/etcd3/policy/Etcd3RoutePolicyIT.java
@@ -49,7 +49,7 @@ class Etcd3RoutePolicyIT extends Etcd3TestSupport {
MockEndpoint mock = getMockEndpoint("mock:leader");
mock.expectedBodiesReceived("ABC");
template.sendBody("direct:leader", "ABC");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
getClient().getLeaseClient().revoke(policyAsLeader.getLeaseId());
getClient().getKVClient().put(
ByteSequence.from(policyAsLeader.getServicePath().getBytes()),
@@ -67,7 +67,7 @@ class Etcd3RoutePolicyIT extends Etcd3TestSupport {
MockEndpoint mock = getMockEndpoint("mock:not-leader");
mock.expectedBodiesReceived("DEF");
template.sendBody("direct:not-leader", "DEF");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerIT.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerIT.java
index ea47aa5c1e7..c557d00c8e1 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerIT.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerIT.java
@@ -73,7 +73,7 @@ public class FacebookComponentConsumerIT extends CamelFacebookTestSupport {
mock.expectedMinimumMessageCount(1);
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerIT.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerIT.java
index 43a7a34ed4f..05619130a85 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerIT.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerIT.java
@@ -114,7 +114,7 @@ public class FacebookComponentProducerIT extends CamelFacebookTestSupport {
}
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java
index 1afb1c0a04e..be1cd855318 100644
--- a/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java
+++ b/components/camel-file-watch/src/test/java/org/apache/camel/component/file/watch/FileWatchComponentTest.java
@@ -128,7 +128,7 @@ public class FileWatchComponentTest extends FileWatchComponentTestBase {
createFile(testPath(), i + "");
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
index 01f2f9cda89..747489d9e9e 100644
--- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
+++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
@@ -46,7 +46,7 @@ public class FlatpackDelimitedDataFormatTest extends CamelTestSupport {
String data = IOConverter.toString(new File("src/test/data/delim/INVENTORY-CommaDelimitedWithQualifier.txt"), null);
template.sendBody("direct:unmarshal", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DataSetList list = mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(4, list.size());
@@ -76,7 +76,7 @@ public class FlatpackDelimitedDataFormatTest extends CamelTestSupport {
data.add(row2);
template.sendBody("direct:marshal", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -101,7 +101,7 @@ public class FlatpackDelimitedDataFormatTest extends CamelTestSupport {
data.add(row2);
template.sendBody("direct:marshal2", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
index ced6c97509e..36b9a0f0159 100644
--- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
+++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
@@ -47,7 +47,7 @@ public class FlatpackFixedLengthDataFormatTest extends CamelTestSupport {
String data = IOConverter.toString(new File("src/test/data/fixed/PEOPLE-FixedLength.txt"), null);
template.sendBody("direct:unmarshal", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DataSetList list = mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(4, list.size());
@@ -72,7 +72,7 @@ public class FlatpackFixedLengthDataFormatTest extends CamelTestSupport {
data.add(row);
template.sendBody("direct:marshal", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String s = mock.getExchanges().get(0).getIn().getBody(String.class);
assertTrue(s.startsWith("JOHN DOE"));
diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
index f4f2dc7b180..760b093d8d3 100644
--- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
+++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
@@ -45,7 +45,7 @@ public class FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest extends Camel
String data = IOConverter.toString(new File("src/test/data/headerandtrailer/PEOPLE-HeaderAndTrailer.txt"), null);
template.sendBody("direct:unmarshal", data);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
DataSetList list = mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(6, list.size());
diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java
index 0b490c6634a..777e1939c89 100644
--- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java
+++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -54,7 +55,7 @@ public class FreemarkerConcurrentTest extends CamelTestSupport {
});
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
executor.shutdownNow();
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java
index b5dfcf8ba10..7dd2bdaed6d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java
@@ -40,7 +40,7 @@ public class FileToFtpsExplicitSSLWithClientAuthIT extends FtpsServerExplicitSSL
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java
index 9f2b97502b7..cbe679940b0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java
@@ -41,7 +41,7 @@ public class FileToFtpsExplicitSSLWithoutClientAuthIT extends FtpsServerExplicit
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java
index b125d50079b..e075c33f339 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java
@@ -42,7 +42,7 @@ public class FileToFtpsExplicitTLSWithClientAuthIT extends FtpsServerExplicitTLS
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java
index e982aef82aa..9122300cd8e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java
@@ -41,7 +41,7 @@ public class FileToFtpsExplicitTLSWithoutClientAuthIT extends FtpsServerExplicit
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java
index 91d8ece0aa8..621105dd6e8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java
@@ -42,7 +42,7 @@ public class FileToFtpsImplicitSSLWithClientAuthIT extends FtpsServerImplicitSSL
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java
index 5ca7d420bc0..d489a7991d9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java
@@ -41,7 +41,7 @@ public class FileToFtpsImplicitSSLWithoutClientAuthIT extends FtpsServerImplicit
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java
index 66a2cca98f6..287f6d415f1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java
@@ -42,7 +42,7 @@ public class FileToFtpsImplicitTLSWithClientAuthIT extends FtpsServerImplicitTLS
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java
index 8b496f92d91..fd1fca304f8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java
@@ -40,7 +40,7 @@ public class FileToFtpsImplicitTLSWithoutClientAuthIT extends FtpsServerImplicit
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java
index b08ffebcbae..3b27e107a18 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java
@@ -44,7 +44,7 @@ public class FileToFtpsWithCustomKeyAndTrustStorePropertiesIT extends FtpsServer
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java
index a294b2cae21..d1cba311926 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java
@@ -42,7 +42,7 @@ public class FileToFtpsWithCustomTrustStorePropertiesIT extends FtpsServerExplic
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIPV6IT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIPV6IT.java
index d091df52507..5cee515a1c6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIPV6IT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIPV6IT.java
@@ -38,7 +38,7 @@ public class FileToFtpsWithDefaultSettingsIPV6IT extends FtpsServerExplicitTLSWi
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java
index e74567c7603..df3f0e35a68 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java
@@ -40,7 +40,7 @@ public class FileToFtpsWithDefaultSettingsIT extends FtpsServerExplicitTLSWithou
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java
index 5cc8421ed0c..7802ced603b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java
@@ -49,7 +49,7 @@ public class FileToFtpsWithFtpClientConfigRefIT extends FtpsServerExplicitSSLWit
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordBeanRefIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordBeanRefIT.java
index 215e13af956..ac071a374a6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordBeanRefIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordBeanRefIT.java
@@ -35,7 +35,7 @@ public class FromFilePasswordBeanRefIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordPropertyRefIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordPropertyRefIT.java
index 30b2daee54d..e451981be5d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordPropertyRefIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePasswordPropertyRefIT.java
@@ -45,7 +45,7 @@ public class FromFilePasswordPropertyRefIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePercentSignInPasswordIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePercentSignInPasswordIT.java
index 8921abdc280..084ac9684dd 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePercentSignInPasswordIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFilePercentSignInPasswordIT.java
@@ -31,7 +31,7 @@ public class FromFilePercentSignInPasswordIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDefaultRootRenameStrategyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDefaultRootRenameStrategyIT.java
index 1df70856a80..f9011fcc119 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDefaultRootRenameStrategyIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDefaultRootRenameStrategyIT.java
@@ -68,7 +68,7 @@ public class FromFileToFtpDefaultRootRenameStrategyIT extends FtpServerTestSuppo
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
await().atMost(250, TimeUnit.MILLISECONDS).untilAsserted(() -> assertFalse(expectedOnFtpServer.exists()));
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java
index cf97a6e9afd..d52e33ff53c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpDeleteIT.java
@@ -46,7 +46,7 @@ public class FromFileToFtpDeleteIT extends FtpServerTestSupport {
template.sendBodyAndHeader(fileUri(testDirectory, "delete"), "Hello World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime());
// file should be deleted
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpIT.java
index 4b3bf9f7140..c9459a4023b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpIT.java
@@ -31,7 +31,7 @@ public class FromFileToFtpIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpWithChmodIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpWithChmodIT.java
index 2d1a00d2c7c..66c0ad31dba 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpWithChmodIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileToFtpWithChmodIT.java
@@ -31,7 +31,7 @@ public class FromFileToFtpWithChmodIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelIT.java
index c2330a57fed..6871cb93b0e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelIT.java
@@ -31,7 +31,7 @@ public class FromFileTransferLoggingLevelIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelVerboseIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelVerboseIT.java
index c8ac2dc56c6..2a7e855237f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelVerboseIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFileTransferLoggingLevelVerboseIT.java
@@ -32,7 +32,7 @@ public class FromFileTransferLoggingLevelVerboseIT extends FtpServerTestSupport
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpAsyncProcessIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpAsyncProcessIT.java
index 7db5a895b65..281f286ea38 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpAsyncProcessIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpAsyncProcessIT.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.AsyncProcessorSupport;
import org.junit.jupiter.api.Test;
@@ -55,7 +56,7 @@ public class FromFtpAsyncProcessIT extends FtpServerTestSupport {
context.getRouteController().startRoute("foo");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give time for files to be deleted on ftp server
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java
index baacca6a4b9..f7d88e9fa9a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpKeepLastModifiedIT.java
@@ -62,7 +62,7 @@ public class FromFtpKeepLastModifiedIT extends FtpServerTestSupport {
mock.expectedFileExists(testDirectory.resolve("hello.txt"));
mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
long t2 = testDirectory.resolve("hello.txt").toFile().lastModified();
@@ -85,7 +85,7 @@ public class FromFtpKeepLastModifiedIT extends FtpServerTestSupport {
mock.expectedFileExists(testDirectory.resolve("hello.txt"));
mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
long t2 = testDirectory.resolve("hello.txt").toFile().lastModified();
@@ -108,7 +108,7 @@ public class FromFtpKeepLastModifiedIT extends FtpServerTestSupport {
mock.expectedFileExists(testDirectory.resolve("hello.txt"));
mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
long t2 = testDirectory.resolve("hello.txt").toFile().lastModified();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNoopIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNoopIT.java
index f13421d437e..bcb363e5fc7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNoopIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNoopIT.java
@@ -46,7 +46,7 @@ public class FromFtpRecursiveNoopIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceivedInAnyOrder("a", "b", "a2", "c", "b2");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// reset mock and send in a new file to be picked up only
mock.reset();
@@ -54,7 +54,7 @@ public class FromFtpRecursiveNoopIT extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl(), "c2", Exchange.FILE_NAME, "c.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNotStepwiseNoBasePathIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNotStepwiseNoBasePathIT.java
index 3a743cd1128..ffc9d77466f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNotStepwiseNoBasePathIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRecursiveNotStepwiseNoBasePathIT.java
@@ -39,7 +39,7 @@ public class FromFtpRecursiveNotStepwiseNoBasePathIT extends FtpServerTestSuppor
// CAMEL-13400
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceivedInAnyOrder("Bye World", "Hello World", "Goodday World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByExpressionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByExpressionIT.java
index 5816e8bca5e..6a5a00a7b42 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByExpressionIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByExpressionIT.java
@@ -50,7 +50,7 @@ public class FromFtpRemoteFileSortByExpressionIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Copenhagen");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -66,7 +66,7 @@ public class FromFtpRemoteFileSortByExpressionIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:reverse");
mock.expectedBodiesReceived("Hello Copenhagen", "Hello London", "Hello Paris");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByIgnoreCaseExpressionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByIgnoreCaseExpressionIT.java
index 2a8e303ba09..668a4e68c00 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByIgnoreCaseExpressionIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByIgnoreCaseExpressionIT.java
@@ -52,7 +52,7 @@ public class FromFtpRemoteFileSortByIgnoreCaseExpressionIT extends FtpServerTest
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello London", "Hello Copenhagen", "Hello Paris");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -68,7 +68,7 @@ public class FromFtpRemoteFileSortByIgnoreCaseExpressionIT extends FtpServerTest
MockEndpoint nocase = getMockEndpoint("mock:nocase");
nocase.expectedBodiesReceived("Hello Copenhagen", "Hello London", "Hello Paris");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -84,7 +84,7 @@ public class FromFtpRemoteFileSortByIgnoreCaseExpressionIT extends FtpServerTest
MockEndpoint nocasereverse = getMockEndpoint("mock:nocasereverse");
nocasereverse.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Copenhagen");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByNestedExpressionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByNestedExpressionIT.java
index 18b29e57924..24e96861628 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByNestedExpressionIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpRemoteFileSortByNestedExpressionIT.java
@@ -50,7 +50,7 @@ public class FromFtpRemoteFileSortByNestedExpressionIT extends FtpServerTestSupp
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello Dublin", "Hello London", "Hello Paris", "Hello Copenhagen");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -66,7 +66,7 @@ public class FromFtpRemoteFileSortByNestedExpressionIT extends FtpServerTestSupp
MockEndpoint reverse = getMockEndpoint("mock:reverse");
reverse.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Dublin", "Hello Copenhagen");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java
index 0f0158b5b84..bbb13de04a0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpSetNamesWithMultiDirectoriesIT.java
@@ -54,7 +54,7 @@ public class FromFtpSetNamesWithMultiDirectoriesIT extends FtpServerTestSupport
context.getRouteController().startRoute("foo");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime());
Exchange ex = resultEndpoint.getExchanges().get(0);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpThirdPoolOkIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpThirdPoolOkIT.java
index 84b2eaef7a4..72deb07da9e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpThirdPoolOkIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromFtpThirdPoolOkIT.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
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;
import static org.awaitility.Awaitility.await;
@@ -46,7 +47,7 @@ public class FromFtpThirdPoolOkIT extends FtpServerTestSupport {
// 2 first attempt should fail
getMockEndpoint("mock:error").expectedMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give time to delete file
await().atMost(200, TimeUnit.MILLISECONDS)
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromQueueThenConsumeFtpToMockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromQueueThenConsumeFtpToMockIT.java
index 76322ab05a3..567f69739c7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromQueueThenConsumeFtpToMockIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FromQueueThenConsumeFtpToMockIT.java
@@ -58,7 +58,7 @@ public class FromQueueThenConsumeFtpToMockIT extends FtpServerTestSupport {
template.sendBodyAndHeader("seda:start", "Hello World", "myfile", "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java
index e12405ffc67..4d7ca3a7afa 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedReadLockIT.java
@@ -51,7 +51,7 @@ public class FtpChangedReadLockIT extends FtpServerTestSupport {
writeSlowFile();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
String content = context.getTypeConverter().convertTo(String.class, testDirectory.resolve("out/slowfile.dat").toFile());
String[] lines = content.split(LS);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java
index 3384653a24e..7cdea184a7b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedRootDirReadLockIT.java
@@ -53,7 +53,7 @@ public class FtpChangedRootDirReadLockIT extends FtpServerTestSupport {
writeSlowFile();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
List<String> lines = Files.readAllLines(testDirectory.resolve("slowfile.dat"));
assertEquals(20, lines.size(), "There should be 20 lines in the file");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java
index f2265ff02bb..7b0360d30d2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpChangedZeroLengthReadLockIT.java
@@ -46,7 +46,7 @@ public class FtpChangedZeroLengthReadLockIT extends FtpServerTestSupport {
writeZeroFile();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void writeZeroFile() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAbsolutePathIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAbsolutePathIT.java
index 6e42c031933..a1add2fe0ee 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAbsolutePathIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAbsolutePathIT.java
@@ -46,7 +46,7 @@ public class FtpConsumerAbsolutePathIT extends FtpServerTestSupport {
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAsyncStressIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAsyncStressIT.java
index 739bfbc85db..07cfbfd783f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAsyncStressIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerAsyncStressIT.java
@@ -50,7 +50,7 @@ public class FtpConsumerAsyncStressIT extends FtpServerTestSupport {
mock.setResultWaitTime(30000);
mock.expectedMinimumMessageCount(50);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerBodyAsStringIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerBodyAsStringIT.java
index 414d9c5bd54..a0553a6b112 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerBodyAsStringIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerBodyAsStringIT.java
@@ -47,7 +47,7 @@ public class FtpConsumerBodyAsStringIT extends FtpServerTestSupport {
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDisconnectIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDisconnectIT.java
index 499ed807424..2f361e5a205 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDisconnectIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDisconnectIT.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.remote.FtpEndpoint;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.net.ftp.FTPClient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -60,7 +61,7 @@ public class FtpConsumerDisconnectIT extends FtpServerTestSupport {
@Test
public void testDisconnectOnDone() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give time for ftp consumer to disconnect, delay is 5000 ms which is
// long
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
index 74622d33137..b182555c016 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
@@ -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;
import static org.awaitility.Awaitility.await;
@@ -40,7 +41,7 @@ public class FtpConsumerDoneFileNameFixedIT extends FtpServerTestSupport {
// wait a bit and it should not pickup the written file as there are no
// done file
- await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> assertMockEndpointsSatisfied());
+ await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
resetMocks();
@@ -49,7 +50,7 @@ public class FtpConsumerDoneFileNameFixedIT extends FtpServerTestSupport {
// write the done file
template.sendBodyAndHeader(getFtpUrl(), "", Exchange.FILE_NAME, "fin.dat");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give time for done file to be deleted
File file = new File(service.getFtpRootDir() + "done/fin.dat");
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 ed9bed2f4fd..3c2885446cd 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
@@ -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;
import static org.awaitility.Awaitility.await;
@@ -50,7 +51,7 @@ public class FtpConsumerDoneFileNameIT extends FtpServerTestSupport {
// write the done file
template.sendBodyAndHeader(getFtpUrl(), "", Exchange.FILE_NAME, "hello.dat");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give time for done file to be deleted
// done file should be deleted now
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 314f1de7f02..6d937764f57 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
@@ -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;
public class FtpConsumerDualDoneFileNameIT extends FtpServerTestSupport {
@@ -37,7 +38,7 @@ public class FtpConsumerDualDoneFileNameIT extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=${file:name}.ready", "Bye World", Exchange.FILE_NAME,
"bye.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIPV6BodyAsStringIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIPV6BodyAsStringIT.java
index 49c45b763d4..d41aa9951c8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIPV6BodyAsStringIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIPV6BodyAsStringIT.java
@@ -49,7 +49,7 @@ public class FtpConsumerIPV6BodyAsStringIT extends FtpServerTestSupport {
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentIT.java
index 83d626af0f4..e5f8b1bae41 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentIT.java
@@ -39,7 +39,7 @@ public class FtpConsumerIdempotentIT extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "report.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Thread.sleep(100);
@@ -53,7 +53,7 @@ public class FtpConsumerIdempotentIT extends FtpServerTestSupport {
// should NOT consume the file again, let 2 secs pass to let the
// consumer try to consume it but it should not
Thread.sleep(2000);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
index ad4723cb30c..011ea31b950 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
@@ -22,6 +22,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class FtpConsumerIdempotentKeyChangedIssueIT extends FtpServerTestSupport {
@@ -40,7 +41,7 @@ public class FtpConsumerIdempotentKeyChangedIssueIT extends FtpServerTestSupport
getMockEndpoint("mock:file").expectedBodiesReceived("Hello World");
template.sendBodyAndHeader(endpoint, "Hello World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
oneExchangeDone.matches(5, TimeUnit.SECONDS);
@@ -49,7 +50,7 @@ public class FtpConsumerIdempotentKeyChangedIssueIT extends FtpServerTestSupport
template.sendBodyAndHeader(endpoint, "Hello World Again", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
index eec33502208..c0a790a4efe 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
import org.junit.jupiter.api.Test;
@@ -55,7 +56,7 @@ public class FtpConsumerIdempotentMemoryRefIT extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello D", "d.txt");
sendFile(getFtpUrl(), "Hello E", "e.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime());
assertEquals(5, repo.getCache().size());
@@ -77,7 +78,7 @@ public class FtpConsumerIdempotentMemoryRefIT extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello F", "f.txt");
sendFile(getFtpUrl(), "Hello G", "g.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime());
assertEquals(5, repo.getCache().size());
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentRefIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentRefIT.java
index 71782b04a6d..a4a2f2cbc19 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentRefIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentRefIT.java
@@ -49,7 +49,7 @@ public class FtpConsumerIdempotentRefIT extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "report.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Thread.sleep(100);
@@ -63,7 +63,7 @@ public class FtpConsumerIdempotentRefIT extends FtpServerTestSupport {
// should NOT consume the file again, let 2 secs pass to let the
// consumer try to consume it but it should not
Thread.sleep(2000);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(invoked, "MyIdempotentRepository should have been invoked");
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java
index 286ed3c2db3..d59e20a6db3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java
@@ -60,7 +60,7 @@ public class FtpConsumerLocalWorkDirectoryAsAbsolutePathIT extends FtpServerTest
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give test some time to close file resources
// now the lwd file should be deleted
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java
index ffef8061bdd..4b0e21192e6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerLocalWorkDirectoryIT.java
@@ -77,9 +77,9 @@ public class FtpConsumerLocalWorkDirectoryIT extends FtpServerTestSupport {
context.getRouteController().startRoute("myRoute");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime());
// and the out file should exists
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMaxMessagesPerPollIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMaxMessagesPerPollIT.java
index b0613241fe9..65785ebddfa 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMaxMessagesPerPollIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMaxMessagesPerPollIT.java
@@ -45,13 +45,13 @@ public class FtpConsumerMaxMessagesPerPollIT extends FtpServerTestSupport {
mock.setResultWaitTime(4000);
mock.expectedPropertyReceived(Exchange.BATCH_SIZE, 2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
mock.reset();
mock.expectedBodiesReceived("Hello World");
mock.expectedPropertyReceived(Exchange.BATCH_SIZE, 1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java
index 2580c854154..5d62ef823ec 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMoveExpressionIT.java
@@ -47,7 +47,7 @@ public class FtpConsumerMoveExpressionIT extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Reports", "report2.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give time for consumer to rename file
String now = new SimpleDateFormat("yyyyMMdd").format(new Date());
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java
index 919ea08bc93..9c28409374b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerMultipleDirectoriesIT.java
@@ -46,7 +46,7 @@ public class FtpConsumerMultipleDirectoriesIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World", "Hello World", "Goodday World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange exchange = mock.getExchanges().get(0);
RemoteFile<?> file = (RemoteFile<?>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerNotEagerMaxMessagesPerPollIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerNotEagerMaxMessagesPerPollIT.java
index 75a70c13d44..649aecfcb8b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerNotEagerMaxMessagesPerPollIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerNotEagerMaxMessagesPerPollIT.java
@@ -46,13 +46,13 @@ public class FtpConsumerNotEagerMaxMessagesPerPollIT extends FtpServerTestSuppor
mock.setResultWaitTime(4000);
mock.expectedPropertyReceived(Exchange.BATCH_SIZE, 2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
mock.reset();
mock.expectedBodiesReceived("CCC");
mock.expectedPropertyReceived(Exchange.BATCH_SIZE, 1);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java
index 7004a0b889a..6308eb231c4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerPostProcessingOnDisconnectIT.java
@@ -51,7 +51,7 @@ public class FtpConsumerPostProcessingOnDisconnectIT extends FtpServerTestSuppor
context.getRouteController().startRoute("foo");
// Check that expectations are satisfied
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// File is deleted
await().atMost(250, TimeUnit.MILLISECONDS)
@@ -76,7 +76,7 @@ public class FtpConsumerPostProcessingOnDisconnectIT extends FtpServerTestSuppor
context.getRouteController().startRoute("bar");
// Check that expectations are satisfied
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java
index 368e3220eec..90a4bdac0a0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerRelativeFileNameIT.java
@@ -59,7 +59,7 @@ public class FtpConsumerRelativeFileNameIT extends FtpServerTestSupport {
// should have file name header set
mock.allMessages().header(Exchange.FILE_NAME).isNotNull();
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// give time for ftp consumer to disconnect
// and expect name to contain target/filename-consumer-XXX.txt
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerReplyStringIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerReplyStringIT.java
index 5825e5bf126..8d242903af4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerReplyStringIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerReplyStringIT.java
@@ -37,7 +37,7 @@ public class FtpConsumerReplyStringIT extends FtpServerTestSupport {
template.requestBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java
index 64c8ca5a7fb..31e92395a01 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerResumeDownloadIT.java
@@ -65,7 +65,7 @@ public class FtpConsumerResumeDownloadIT extends FtpServerTestSupport {
// start route
context.getRouteController().startRoute("myRoute");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertTrue(notify.matchesWaitTime());
// and the out file should exists
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java
index 9ad8149a99d..8584d18fca5 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerThrowExceptionOnLoginFailedIT.java
@@ -24,6 +24,7 @@ import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFileOperationFailedException;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.support.service.ServiceSupport;
import org.junit.jupiter.api.Test;
@@ -54,7 +55,7 @@ public class FtpConsumerThrowExceptionOnLoginFailedIT extends FtpServerTestSuppo
assertTrue(latch.await(5, TimeUnit.SECONDS));
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
// consumer should be stopped
Consumer consumer = context.getRoute("foo").getConsumer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerUsingFTPClientConfigIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerUsingFTPClientConfigIT.java
index 74ea960c639..3d2fcd820ac 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerUsingFTPClientConfigIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerUsingFTPClientConfigIT.java
@@ -52,7 +52,7 @@ public class FtpConsumerUsingFTPClientConfigIT extends FtpServerTestSupport {
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
private void prepareFtpServer() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithCharsetIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithCharsetIT.java
index 70748ed8e34..3a72b700a2a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithCharsetIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithCharsetIT.java
@@ -94,7 +94,7 @@ public class FtpConsumerWithCharsetIT extends FtpServerTestSupport {
public void testConsumerWithCharset() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived(payload);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange exchange = mock.getExchanges().get(0);
RemoteFile<?> file = (RemoteFile<?>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithNoFileOptionIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithNoFileOptionIT.java
index b8fce8cc2f6..09e237352f6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithNoFileOptionIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerWithNoFileOptionIT.java
@@ -48,7 +48,7 @@ public class FtpConsumerWithNoFileOptionIT extends FtpServerTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange exchange = mock.getExchanges().get(0);
RemoteFile<?> file = (RemoteFile<?>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpNoReconnectAttemptUnknownHostIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpNoReconnectAttemptUnknownHostIT.java
index e7693447faf..3df3f6b7da5 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpNoReconnectAttemptUnknownHostIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpNoReconnectAttemptUnknownHostIT.java
@@ -34,7 +34,7 @@ public class FtpNoReconnectAttemptUnknownHostIT extends FtpServerTestSupport {
// let it run a little
Thread.sleep(3000);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichBridgeErrorHandlerIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichBridgeErrorHandlerIT.java
index 481df1b6b73..3981f7eb07a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichBridgeErrorHandlerIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichBridgeErrorHandlerIT.java
@@ -21,6 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.remote.BaseServerTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.ftp.services.FtpServiceFactory;
import org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedService;
import org.junit.jupiter.api.Test;
@@ -50,7 +51,7 @@ public class FtpPollEnrichBridgeErrorHandlerIT extends BaseServerTestSupport {
template.sendBody("seda:start", "Hello World");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
Exchange out = getMockEndpoint("mock:dead").getExchanges().get(0);
assertNotNull(out);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java
index 384d0c1cc69..f6fcbb96ced 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java
@@ -49,7 +49,7 @@ public class FtpPollEnrichConsumeWithDisconnectAndDeleteIT extends FtpServerTest
ProducerTemplate triggerTemplate = context.createProducerTemplate();
triggerTemplate.sendBody("vm:trigger", "");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
File file = service.ftpFile("poll/hello.txt").toFile();
await().atMost(3, TimeUnit.SECONDS)
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollingConsumerIdleMessageIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollingConsumerIdleMessageIT.java
index 1780bb75cc0..114bb98f805 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollingConsumerIdleMessageIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollingConsumerIdleMessageIT.java
@@ -34,7 +34,7 @@ public class FtpPollingConsumerIdleMessageIT extends FtpServerTestSupport {
Thread.sleep(110);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
assertNull(mock.getExchanges().get(0).getIn().getBody());
assertNull(mock.getExchanges().get(1).getIn().getBody());
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyFileAlreadyExistIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyFileAlreadyExistIT.java
index 27660fe5aa1..60f2d3ee687 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyFileAlreadyExistIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerAllowNullBodyFileAlreadyExistIT.java
@@ -43,7 +43,7 @@ public class FtpProducerAllowNullBodyFileAlreadyExistIT extends FtpServerTestSup
template.sendBody("direct:appendTypeAppend", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -54,7 +54,7 @@ public class FtpProducerAllowNullBodyFileAlreadyExistIT extends FtpServerTestSup
template.sendBody("direct:appendTypeOverride", null);
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConcurrentIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConcurrentIT.java
index 04f73b1c9b6..7438c15d2f5 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConcurrentIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConcurrentIT.java
@@ -21,6 +21,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -60,7 +61,7 @@ public class FtpProducerConcurrentIT extends FtpServerTestSupport {
});
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
executor.shutdownNow();
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConnectErrorsHeaderIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConnectErrorsHeaderIT.java
index f08e30d7b75..476dcae9b04 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConnectErrorsHeaderIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerConnectErrorsHeaderIT.java
@@ -33,7 +33,7 @@ public class FtpProducerConnectErrorsHeaderIT extends FtpServerTestSupport {
mock.expectedHeaderReceived("CamelFtpReplyCode", "530");
template.sendBody("direct:start", "hi");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendIT.java
index 50a7cdf9cd3..e865d43fcdc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendIT.java
@@ -48,7 +48,7 @@ public class FtpProducerFileExistAppendIT extends FtpServerTestSupport {
mock.expectedFileExists(service.ftpFile("exist/hello.txt"), expectBody);
template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendNoFileBeforeIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendNoFileBeforeIT.java
index c6119f2b5a3..11523504bc8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendNoFileBeforeIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistAppendNoFileBeforeIT.java
@@ -35,7 +35,7 @@ public class FtpProducerFileExistAppendNoFileBeforeIT extends FtpServerTestSuppo
template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java
index aa3536e2df6..4be02910c67 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistFailIT.java
@@ -56,7 +56,7 @@ public class FtpProducerFileExistFailIT extends FtpServerTestSupport {
= assertIsInstanceOf(GenericFileOperationFailedException.class, ex.getCause());
assertEquals("File already exist: exist/hello.txt. Cannot write new file.", cause.getMessage());
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistIgnoreIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistIgnoreIT.java
index e09d0f1b8f7..bb0fe0b8ade 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistIgnoreIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistIgnoreIT.java
@@ -44,7 +44,7 @@ public class FtpProducerFileExistIgnoreIT extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideIT.java
index e1fe6bdcab9..53ec2b30796 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideIT.java
@@ -43,7 +43,7 @@ public class FtpProducerFileExistOverrideIT extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideNoFileBeforeIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideNoFileBeforeIT.java
index 1a92b85bcff..b1b02c43139 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideNoFileBeforeIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerFileExistOverrideNoFileBeforeIT.java
@@ -35,7 +35,7 @@ public class FtpProducerFileExistOverrideNoFileBeforeIT extends FtpServerTestSup
template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java
index 1fecb79cf8d..9286a35de60 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerJailStartingDirectoryIT.java
@@ -44,7 +44,7 @@ public class FtpProducerJailStartingDirectoryIT extends FtpServerTestSupport {
assertTrue(iae.getMessage().contains("as the filename is jailed to the starting directory"));
}
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Test
@@ -54,7 +54,7 @@ public class FtpProducerJailStartingDirectoryIT extends FtpServerTestSupport {
template.sendBodyAndHeader("direct:start", "Bye World", Exchange.FILE_NAME, "jail/bye.txt");
- assertMockEndpointsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerRecipientListParallelTimeoutManualIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerRecipientListParallelTimeoutManualIT.java
index 8864193c1e4..33e69b01773 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerRecipientListParallelTimeoutManualIT.java
... 26222 lines suppressed ...
[camel] 03/03: (chores) Inlined calls to CamelTestSupport.resetMocks
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ef9e711e5ab50a2a1c47eb83b69a1691000ffa2c
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Sat Oct 1 17:59:17 2022 +0200
(chores) Inlined calls to CamelTestSupport.resetMocks
---
.../camel/component/aws/xray/CamelAwsXRayTestSupport.java | 4 ++--
.../csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java | 2 +-
.../camel/component/disruptor/DisruptorBufferingTest.java | 2 +-
.../disruptor/DisruptorConsumerSuspendResumeTest.java | 4 ++--
.../component/disruptor/DisruptorMultipleConsumersTest.java | 4 ++--
.../remote/integration/FtpConsumerDoneFileNameFixedIT.java | 2 +-
.../file/remote/integration/FtpConsumerDoneFileNameIT.java | 2 +-
.../integration/FtpConsumerIdempotentKeyChangedIssueIT.java | 2 +-
.../remote/integration/FtpConsumerIdempotentMemoryRefIT.java | 2 +-
.../component/ignite/IgniteCacheContinuousQueryTest.java | 6 +++---
.../org/apache/camel/component/ignite/IgniteEventsTest.java | 2 +-
.../camel/component/jetty/HttpEmptyQueryParameterTest.java | 2 +-
.../component/jetty/JettyLongestContextPathMatchTest.java | 12 ++++++------
.../camel/component/jetty/rest/RestJettyGetCorsTest.java | 2 +-
.../camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java | 4 ++--
.../jms/JmsRequestReplyTempQueueMultipleConsumersTest.java | 2 +-
.../org/apache/camel/component/jms/JmsSuspendResumeTest.java | 4 ++--
.../apache/camel/component/jms/ManagedJmsSelectorTest.java | 2 +-
.../camel/component/jms/TwoConsumerOnSameQueueTest.java | 6 +++---
.../camel/component/jms/TwoConsumerOnSameTopicTest.java | 6 +++---
.../DynamicRoutersWithJMSMessageLostHeadersIssueTest.java | 2 +-
.../apache/camel/language/joor/JoorPreCompileFalseTest.java | 2 +-
.../test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java | 2 +-
.../metrics/messagehistory/ManagedMessageHistoryTest.java | 2 +-
.../camel/component/mllp/MllpIdleTimeoutStrategyTest.java | 2 +-
.../netty/http/NettyHttpEmptyQueryParameterTest.java | 2 +-
.../netty/http/NettyHttpTwoRoutesStopOneRouteTest.java | 2 +-
.../component/netty/http/rest/RestNettyHttpGetCorsTest.java | 2 +-
.../camel/component/pubnub/example/PubNubStateExample.java | 2 +-
.../pulsar/integration/PulsarConsumerPatternInIT.java | 2 +-
.../apache/camel/component/quartz/QuartzStopRouteTest.java | 4 ++--
.../camel/component/quartz/QuartzSuspendRouteTest.java | 4 ++--
.../quartz/FileConsumerQuartzSchedulerRestartTest.java | 2 +-
.../rabbitmq/integration/RabbitMQSupendResumeIT.java | 4 ++--
.../camel/component/sjms/SjmsComponentRestartTest.java | 4 ++--
.../camel/component/sjms2/Sjms2ComponentRestartTest.java | 4 ++--
.../camel/component/stax/IssueWithWrongEncodingTest.java | 2 +-
.../java/org/apache/camel/test/junit5/CamelTestSupport.java | 9 +--------
.../component/undertow/rest/RestUndertowHttpGetCorsTest.java | 4 ++--
.../undertow/rest/RestUndertowHttpGetOrderingIssueTest.java | 4 ++--
.../undertow/rest/RestUndertowHttpMultipleVerbsTest.java | 2 +-
.../undertow/rest/UndertowHttpEmptyQueryParameterTest.java | 2 +-
.../vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java | 4 ++--
.../camel/component/xslt/saxon/SAXSourceLogBodyTest.java | 2 +-
.../dataformat/zipfile/ZipFileIteratorDataFormatTest.java | 2 +-
.../dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java | 4 ++--
.../camel/itest/jetty/JettyFailoverRoundRobinTest.java | 2 +-
.../itest/jetty/JettySimulateFailoverRoundRobinTest.java | 2 +-
.../camel/itest/jetty/JettySpringFailoverRoundRobinTest.java | 2 +-
50 files changed, 75 insertions(+), 82 deletions(-)
diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
index 114138dcbf1..66e60d8d3b4 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
@@ -60,9 +61,8 @@ public class CamelAwsXRayTestSupport extends CamelTestSupport {
socketListener.getReceivedData().clear();
}
- @Override
protected void resetMocks() {
- super.resetMocks();
+ MockEndpoint.resetMocks(context);
}
@Override
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
index 6664d7cbdde..7ccc40169b4 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
@@ -40,7 +40,7 @@ public class CsvUnmarshalTwoCsvDataFormatConcurrentTest extends CamelTestSupport
result2.expectedMessageCount(1);
sendAndVerify("|", result);
- resetMocks();
+ MockEndpoint.resetMocks(context);
result.expectedMessageCount(1);
result2.expectedMessageCount(1);
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
index 9d30bed3c77..cd88b33e2fa 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorBufferingTest.java
@@ -86,7 +86,7 @@ public class DisruptorBufferingTest extends CamelTestSupport {
mockEndpoint.expectedMessageCount(3);
mockEndpoint.assertIsSatisfied();
- resetMocks();
+ MockEndpoint.resetMocks(context);
template.sendBody("disruptor:foo", "D");
template.sendBody("disruptor:foo", "E");
template.sendBody("disruptor:foo", "F");
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
index 398e1c04803..b24eff1bbd3 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConsumerSuspendResumeTest.java
@@ -48,7 +48,7 @@ public class DisruptorConsumerSuspendResumeTest extends CamelTestSupport {
// send a message to the route but the consumer is suspended
// so it should not route it
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
// wait a bit to ensure consumer is suspended, as it could be in a poll mode where
@@ -60,7 +60,7 @@ public class DisruptorConsumerSuspendResumeTest extends CamelTestSupport {
mock.assertIsSatisfied(2000);
// resume consumer
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(1);
// resume bar consumer (not the route)
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
index ecf5eed02e1..af853f0cdfb 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
@@ -52,7 +52,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
}
});
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(20);
getMockEndpoint("mock:b").expectedMessageCount(20);
@@ -63,7 +63,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
template.sendBody("disruptor:bar", "Bye World");
}
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
context.getRouteController().suspendRoute("testRoute");
getMockEndpoint("mock:a").expectedMessageCount(20);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
index b182555c016..45398e1a602 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameFixedIT.java
@@ -43,7 +43,7 @@ public class FtpConsumerDoneFileNameFixedIT extends FtpServerTestSupport {
// done file
await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java
index c33e2444f84..f8c30a3d6d2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerDoneFileNameIT.java
@@ -44,7 +44,7 @@ public class FtpConsumerDoneFileNameIT extends FtpServerTestSupport {
MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
index 011ea31b950..42301f53c39 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentKeyChangedIssueIT.java
@@ -45,7 +45,7 @@ public class FtpConsumerIdempotentKeyChangedIssueIT extends FtpServerTestSupport
oneExchangeDone.matches(5, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:file").expectedBodiesReceived("Hello World Again");
template.sendBodyAndHeader(endpoint, "Hello World Again", Exchange.FILE_NAME, "hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
index c0a790a4efe..661071244f4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpConsumerIdempotentMemoryRefIT.java
@@ -66,7 +66,7 @@ public class FtpConsumerIdempotentMemoryRefIT extends FtpServerTestSupport {
assertTrue(repo.contains("d.txt"));
assertTrue(repo.contains("e.txt"));
- resetMocks();
+ MockEndpoint.resetMocks(context);
notify = new NotifyBuilder(context).whenDone(2).create();
getMockEndpoint("mock:result").expectedMessageCount(2);
diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
index ee58748e199..6a996731de4 100644
--- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
+++ b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
@@ -114,7 +114,7 @@ public class IgniteCacheContinuousQueryTest extends AbstractIgniteTest implement
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:test2").expectedMessageCount(100);
@@ -136,7 +136,7 @@ public class IgniteCacheContinuousQueryTest extends AbstractIgniteTest implement
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:test3").expectedMessageCount(50);
@@ -219,7 +219,7 @@ public class IgniteCacheContinuousQueryTest extends AbstractIgniteTest implement
context.getRouteController().stopRoute(route.getId());
}
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
public static class Person implements Serializable {
diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
index 806262907a3..824034d2766 100644
--- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
+++ b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
@@ -135,7 +135,7 @@ public class IgniteEventsTest extends AbstractIgniteTest {
}
context.getRouteController().stopRoute(route.getId());
}
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
@Override
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java
index 5f48bfd8003..026626bc150 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpEmptyQueryParameterTest.java
@@ -31,7 +31,7 @@ public class HttpEmptyQueryParameterTest extends BaseJettyTest {
assertEquals("Header: 123", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedHeaderReceived("id", "");
out = fluentTemplate.to("http://localhost:{{port}}/foo?id=").request(String.class);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java
index 38b876a6dc2..cabf644d7c1 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyLongestContextPathMatchTest.java
@@ -34,7 +34,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(1);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
@@ -43,7 +43,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/ccc", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(1);
@@ -52,7 +52,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(1);
@@ -61,7 +61,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb/foo", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
@@ -70,7 +70,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb/ccc/", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
@@ -79,7 +79,7 @@ public class JettyLongestContextPathMatchTest extends BaseJettyTest {
template.sendBody("http://localhost:{{port}}/myapp/aaa/bbb/ccc/foo", null);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:aaa").expectedMessageCount(0);
getMockEndpoint("mock:bbb").expectedMessageCount(0);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java
index 0cb95e03185..2f0780f9b23 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java
@@ -50,7 +50,7 @@ public class RestJettyGetCorsTest extends BaseJettyTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedMessageCount(1);
// send GET request which should be routed
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
index 964b7677b20..789ce39a83f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
@@ -45,7 +45,7 @@ public class JmsInOnlyDisableTimeToLiveTest extends AbstractJMSTest {
// wait after the msg has expired
Thread.sleep(2500);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:end").expectedMessageCount(0);
cool.someBusinessLogic();
@@ -72,7 +72,7 @@ public class JmsInOnlyDisableTimeToLiveTest extends AbstractJMSTest {
// wait after the msg has expired
Thread.sleep(2500);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:end").expectedBodiesReceived("Hello World 2");
cool.someBusinessLogic();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
index 8fc1829b995..32c93b1b7bc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
@@ -69,7 +69,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
}
private void doSendMessages(int files) throws Exception {
- resetMocks();
+ MockEndpoint.resetMocks(context);
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(files);
mockEndpoint.expectsNoDuplicates(body());
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
index 2f050626ca3..3ec6fc8d79b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
@@ -36,7 +36,7 @@ public class JmsSuspendResumeTest extends AbstractPersistentJMSTest {
context.getRouteController().suspendRoute("JmsSuspendResumeTest");
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
// sleep a bit to ensure its properly suspended
@@ -47,7 +47,7 @@ public class JmsSuspendResumeTest extends AbstractPersistentJMSTest {
MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedBodiesReceived("Bye World");
context.getRouteController().resumeRoute("JmsSuspendResumeTest");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
index fd50b263ce4..ec82133248d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
@@ -84,7 +84,7 @@ public class ManagedJmsSelectorTest extends CamelTestSupport {
// change the selector at runtime
- resetMocks();
+ MockEndpoint.resetMocks(context);
mbeanServer.setAttribute(on, new Attribute("MessageSelector", "brand='softdrink'"));
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
index 48b5d0bf7f2..16d187014a9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
@@ -39,7 +39,7 @@ public class TwoConsumerOnSameQueueTest extends AbstractPersistentJMSTest {
context.getRouteController().stopRoute("a");
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World", "Bye World");
@@ -53,7 +53,7 @@ public class TwoConsumerOnSameQueueTest extends AbstractPersistentJMSTest {
context.getRouteController().startRoute("a");
// send new message should go to both A and B
- resetMocks();
+ MockEndpoint.resetMocks(context);
sendTwoMessagesWhichShouldReceivedOnBothEndpointsAndAssert();
}
@@ -67,7 +67,7 @@ public class TwoConsumerOnSameQueueTest extends AbstractPersistentJMSTest {
assertTrue(context.removeRoute("a"));
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World", "Bye World");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
index 65b1f87554a..4d5fda5ed46 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
@@ -69,7 +69,7 @@ public class TwoConsumerOnSameTopicTest extends AbstractPersistentJMSTest {
context.getRouteController().stopRoute("a");
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World");
@@ -79,7 +79,7 @@ public class TwoConsumerOnSameTopicTest extends AbstractPersistentJMSTest {
MockEndpoint.assertIsSatisfied(context);
// send new message should go to both A and B
- resetMocks();
+ MockEndpoint.resetMocks(context);
// now start route A
context.getRouteController().startRoute("a");
@@ -99,7 +99,7 @@ public class TwoConsumerOnSameTopicTest extends AbstractPersistentJMSTest {
assertTrue(context.removeRoute("a"));
// send new message should go to B only
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedBodiesReceived("Bye World");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
index 1d8e7789024..11524677d40 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
@@ -71,7 +71,7 @@ public class DynamicRoutersWithJMSMessageLostHeadersIssueTest extends AbstractJM
template.sendBody("direct:foo", "A");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// actvivemq
getMockEndpoint("mock:checkHeader").expectedMessageCount(1);
diff --git a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java
index 296a7cb42c0..3c6d930a6ce 100644
--- a/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java
+++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/JoorPreCompileFalseTest.java
@@ -50,7 +50,7 @@ public class JoorPreCompileFalseTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
// update file
- resetMocks();
+ MockEndpoint.resetMocks(context);
template.sendBodyAndHeader("file:target?fileExist=Override", "'Bye ' + body", Exchange.FILE_NAME, "update.joor");
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
index 3cbe9633b1b..e24ad589d77 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
@@ -69,7 +69,7 @@ public class JsonPathCBRTest extends CamelTestSupport {
@Test
public void testCheapBicycle() throws Exception {
sendMessageToBicycleRoute("direct:bicycle");
- resetMocks();
+ MockEndpoint.resetMocks(context);
sendMessageToBicycleRoute("direct:bicycle2");
}
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java
index 674fea3cb0b..6dd778983ca 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java
@@ -76,7 +76,7 @@ public class JsonPathStreamCachingCBRTest extends CamelTestSupport {
@Test
public void testCheapBicycle() throws Exception {
sendMessageToBicycleRoute("direct:bicycle");
- resetMocks();
+ MockEndpoint.resetMocks(context);
sendMessageToBicycleRoute("direct:bicycle2");
}
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
index c22473fd4b1..d9062a58ef4 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
@@ -104,7 +104,7 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
// reset
getMBeanServer().invoke(on, "reset", null, null);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:foo").expectedMessageCount(1);
template.sendBody("seda:foo", "Hello Again");
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
index 0c072133c4c..699e1cd56fb 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
@@ -141,7 +141,7 @@ public class MllpIdleTimeoutStrategyTest extends CamelTestSupport {
@BeforeEach
public void setupMock() {
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
private void sendHl7Message(ProducerTemplate template) throws Exception {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java
index 541bfd8ffbe..288fb58edd3 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEmptyQueryParameterTest.java
@@ -31,7 +31,7 @@ public class NettyHttpEmptyQueryParameterTest extends BaseNettyTest {
assertEquals("Header: 123", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedHeaderReceived("id", "");
out = fluentTemplate.to("netty-http:http://localhost:{{port}}/foo?id=").request(String.class);
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java
index c28a2eef801..43a1790c496 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpTwoRoutesStopOneRouteTest.java
@@ -43,7 +43,7 @@ public class NettyHttpTwoRoutesStopOneRouteTest extends BaseNettyTest {
// stop foo route
context.getRouteController().stopRoute("foo");
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:foo").expectedMessageCount(0);
getMockEndpoint("mock:bar").expectedBodiesReceived("Hello Camel");
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
index a457c08b511..818e3f1b48c 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
@@ -45,7 +45,7 @@ public class RestNettyHttpGetCorsTest extends BaseNettyTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedMessageCount(1);
// send GET request which should be routed
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
index b7026fb5ad4..51332b01830 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
@@ -49,7 +49,7 @@ public class PubNubStateExample extends CamelTestSupport {
assertNotNull(response.getState());
assertEquals("preben", response.getState().getAsJsonObject().get("name").getAsString());
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(1);
headers.clear();
headers.put(PubNubConstants.OPERATION, "GETSTATE");
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java
index 4c2da1f0454..d6d9441b154 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/integration/PulsarConsumerPatternInIT.java
@@ -120,7 +120,7 @@ public class PulsarConsumerPatternInIT extends PulsarITSupport {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// now switch to patterns
context.getRouteController().stopRoute("one");
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
index 555a966df9a..ee7580f4489 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java
@@ -36,12 +36,12 @@ public class QuartzStopRouteTest extends BaseQuartzTest {
int size = mock.getReceivedCounter();
assertEquals(1, size, "Should not schedule when stopped");
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
mock.assertIsSatisfied(3000);
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMinimumMessageCount(1);
context.getRouteController().startRoute("foo");
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
index b9677849349..725183e0d15 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java
@@ -35,14 +35,14 @@ public class QuartzSuspendRouteTest extends BaseQuartzTest {
int size = mock.getReceivedCounter();
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
mock.assertIsSatisfied(3000);
assertEquals(size, size, "Should not schedule when suspended");
- resetMocks();
+ MockEndpoint.resetMocks(context);
mock.expectedMinimumMessageCount(1);
context.getRouteController().resumeRoute("foo");
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
index df4745fdfa7..3ef9432209c 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java
@@ -37,7 +37,7 @@ public class FileConsumerQuartzSchedulerRestartTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
context.getRouteController().stopRoute("foo");
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(1);
template.sendBodyAndHeader(fileUri(testDirectory), "Bye World", Exchange.FILE_NAME, "bye.txt");
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java
index c85cbf14c19..4f6ef4f387e 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java
@@ -66,14 +66,14 @@ public class RabbitMQSupendResumeIT extends AbstractRabbitMQIT {
// sleep a bit to ensure its properly suspended
Thread.sleep(2000);
- resetMocks();
+ MockEndpoint.resetMocks(context);
resultEndpoint.expectedMessageCount(0);
template.sendBody("Hello2");
MockEndpoint.assertIsSatisfied(context, 1, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
resultEndpoint.expectedBodiesReceived("Hello2");
resultEndpoint.expectedMessageCount(1);
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
index 2bf72235568..969c14fb20f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
@@ -58,7 +58,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
// restart
context.stop();
- resetMocks();
+ MockEndpoint.resetMocks(context);
// rebind as the registry is cleared on stop
context.getRegistry().bind("activemqCF", connectionFactory);
@@ -95,7 +95,7 @@ public class SjmsComponentRestartTest extends CamelTestSupport {
context.suspend();
context.resume();
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:test").expectedMessageCount(1);
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
index 09adcbc9844..b7e27969bc4 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
@@ -53,7 +53,7 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
// restart
context.stop();
- resetMocks();
+ MockEndpoint.resetMocks(context);
// rebind as the registry is cleared on stop
context.getRegistry().bind("activemqCF", connectionFactory);
@@ -88,7 +88,7 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
// restart
context.suspend();
- resetMocks();
+ MockEndpoint.resetMocks(context);
context.resume();
getMockEndpoint("mock:test").expectedMessageCount(1);
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
index 4752af9d7a6..5bff98c080b 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
@@ -50,7 +50,7 @@ public class IssueWithWrongEncodingTest extends CamelTestSupport {
@Test
public void testOkEncoding() throws Exception {
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(1);
File file = new File("src/test/resources/products_with_valid_utf8.xml");
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 07ab9b2e592..32f5e7867e8 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -367,7 +367,7 @@ public abstract class CamelTestSupport
LOG.debug("Reset between test methods");
// and in between tests we must do IoC and reset mocks
postProcessTest();
- resetMocks();
+ MockEndpoint.resetMocks(context);
}
} else {
// test is per test so always setup
@@ -982,13 +982,6 @@ public abstract class CamelTestSupport
return language;
}
- /**
- * Reset all Mock endpoints.
- */
- protected void resetMocks() {
- MockEndpoint.resetMocks(context);
- }
-
protected void assertValidContext(CamelContext context) {
assertNotNull(context, "No context found!");
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
index 3a799486cb6..57c0f0755b8 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
@@ -45,7 +45,7 @@ public class RestUndertowHttpGetCorsTest extends BaseUndertowTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:inputGet").expectedMessageCount(1);
// send GET request which should be routed
@@ -76,7 +76,7 @@ public class RestUndertowHttpGetCorsTest extends BaseUndertowTest {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:inputPut").expectedMessageCount(1);
// send PUT request which should be routed
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
index c9678ad06c7..719cb54be9b 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
@@ -32,14 +32,14 @@ public class RestUndertowHttpGetOrderingIssueTest extends BaseUndertowTest {
assertEquals("Route without name", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:pippo").expectedMessageCount(1);
out = template.requestBody("undertow:http://localhost:{{port}}/Donald", null, String.class);
assertEquals("Route with name: Donald", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:bar").expectedMessageCount(1);
out = template.requestBody("undertow:http://localhost:{{port}}/bar", null, String.class);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
index 53d5717cebe..86cae5db373 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
@@ -31,7 +31,7 @@ public class RestUndertowHttpMultipleVerbsTest extends BaseUndertowTest {
template.requestBodyAndHeader("undertow:http://localhost:{{port}}/example/123", null, Exchange.HTTP_METHOD, "GET");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:get").expectedMessageCount(0);
getMockEndpoint("mock:put").expectedMessageCount(1);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
index 6220879e41d..c6444cf23f8 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
@@ -32,7 +32,7 @@ public class UndertowHttpEmptyQueryParameterTest extends BaseUndertowTest {
assertEquals("Header: 123", out);
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:input").expectedHeaderReceived("id", "");
out = fluentTemplate.to("undertow:http://localhost:{{port}}/foo?id=").request(String.class);
diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java
index 23f1401855a..23cde92e570 100644
--- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java
+++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerSuspendResumeTest.java
@@ -85,7 +85,7 @@ public class VertxKafkaConsumerSuspendResumeTest extends BaseEmbeddedKafkaTest {
// suspend
context.getRouteController().suspendRoute("foo");
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(0);
for (int k = 3; k < 10; k++) {
@@ -97,7 +97,7 @@ public class VertxKafkaConsumerSuspendResumeTest extends BaseEmbeddedKafkaTest {
getMockEndpoint("mock:result").setResultMinimumWaitTime(1000);
MockEndpoint.assertIsSatisfied(context, 5, TimeUnit.SECONDS);
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:result").expectedMessageCount(7);
// resume
diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java
index 70ca7e9ffb6..2b231984a7f 100644
--- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java
+++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.sax.SAXSource;
-import org.apache.camel.component.mock.MockEndpoint;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -30,6 +29,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java
index 483421ffdf8..a53f0897c64 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java
@@ -37,7 +37,7 @@ public class ZipFileIteratorDataFormatTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// unzip the file
getMockEndpoint("mock:unzip").expectedBodiesReceived("ABCDEF1234567890");
diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java
index 16bc048a499..a10246d1f59 100644
--- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java
+++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java
@@ -123,7 +123,7 @@ public class RouteWatcherReloadStrategyTest extends CamelTestSupport {
template.sendBody("direct:bar", "Hello World");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
LOG.info("Copying file to target/dummy");
@@ -183,7 +183,7 @@ public class RouteWatcherReloadStrategyTest extends CamelTestSupport {
template.sendBody("direct:bar", "Hello World");
MockEndpoint.assertIsSatisfied(context);
- resetMocks();
+ MockEndpoint.resetMocks(context);
// now update the file
LOG.info("Updating file in target/dummy");
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
index 56b2edcb412..836abafc2fc 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
@@ -55,7 +55,7 @@ public class JettyFailoverRoundRobinTest extends CamelTestSupport {
// reset mocks and send a message again to see that round robin
// continue where it should
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:bad").expectedMessageCount(0);
getMockEndpoint("mock:bad2").expectedMessageCount(0);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
index f09caf9179c..c9feb889d0b 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
@@ -62,7 +62,7 @@ public class JettySimulateFailoverRoundRobinTest extends CamelTestSupport {
// reset mocks and send a message again to see that round robin
// continue where it should
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:bad").expectedMessageCount(0);
getMockEndpoint("mock:bad2").expectedMessageCount(0);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
index a952193d328..13c638dae3d 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
@@ -60,7 +60,7 @@ public class JettySpringFailoverRoundRobinTest extends CamelSpringTestSupport {
// reset mocks and send a message again to see that round robin
// continue where it should
- resetMocks();
+ MockEndpoint.resetMocks(context);
getMockEndpoint("mock:JettySpringFailoverRoundRobinTestBad").expectedMessageCount(0);
getMockEndpoint("mock:JettySpringFailoverRoundRobinTestBad2").expectedMessageCount(0);
[camel] 02/03: (chores) Inlined calls to CamelTestSupport.assertIsSatisfied(long, TimeUnit)
Posted by or...@apache.org.
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