You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/27 15:38:47 UTC
[camel] branch master updated (453b74c -> e9e068d)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 453b74c Aligned Spring boot archetype to 2.3.2.RELEASE
new 006893a [CAMEL-11807] Upgrade camel-workday to junit5
new a22c39f [CAMEL-11807] Upgrade camel-xj to junit5
new 203f946 [CAMEL-11807] Upgrade camel-xmlsecurity to junit5
new 8ac9e3a [CAMEL-11807] Upgrade camel-xmpp to junit5
new 0c964a5 [CAMEL-11807] Upgrade camel-xstream to junit5
new 5a746d5 [CAMEL-11807] Upgrade camel-yammer to junit5
new d594e26 [CAMEL-11807] Upgrade camel-zip-deflater to junit5
new 153f251 [CAMEL-11807] Upgrade camel-zipfile to junit5
new fc1a140 [CAMEL-11807] Upgrade camel-zookeeper-master to junit5
new 0876ea8 [CAMEL-11807] Upgrade camel-zookeeper to junit5
new c5cb446 [CAMEL-11807] Upgrade camel-undertow-spring-security to junit5
new eedcf3b [CAMEL-11807] Upgrade camel-zipkin to junit5
new e061d3e [CAMEL-11807] Upgrade camel-openstack to junit5
new 91a49f7 [CAMEL-11807] Upgrade camel-optaplanner to junit5
new 9458957 [CAMEL-11807] Upgrade camel-printer to junit5
new 109f051 [CAMEL-11807] Upgrade camel-resilience4j to junit5
new 4fdaf75 [CAMEL-11807] Upgrade camel-spring-redis to junit5
new faf4003 [CAMEL-11807] Upgrade camel-lzf to junit5
new 8838f18 [CAMEL-11807] Upgrade camel-azure-storage-blob to junit5
new 9547f88 [CAMEL-11807] Upgrade camel-azure-storage-queue to junit5
new 6af5fd7 [CAMEL-11807] Upgrade camel-beanstalk to junit5
new 2edfd34 [CAMEL-11807] Upgrade camel-atmosphere-websocket to junit5
new 0993bd9 [CAMEL-11807] Upgrade camel-bean-validator to junit5
new 61f7f3c [CAMEL-11807] Upgrade camel-cxf-transport to junit5
new 87be882 [CAMEL-11807] Upgrade camel-couchdb to junit5
new 5b73014 [CAMEL-11807] Upgrade camel-cxf to junit5
new b417995 [CAMEL-11807] Upgrade camel-gson to junit5
new c834a1a [CAMEL-11807] Upgrade camel-jing to junit5
new f017c8c [CAMEL-11807] Upgrade camel-msv to junit5
new d35e7ca [CAMEL-11807] Upgrade camel-sap-netweaver to junit5
new d2b4958 [CAMEL-11807] Upgrade camel-swagger-java to junit5
new 727b849 [CAMEL-11807] Upgrade camel-sjms to junit5
new f079aef [CAMEL-11807] Upgrade camel-ftp to junit5
new 99f5084 [CAMEL-11807] Upgrade camel-pulsar to junit5
new d3fc30b [CAMEL-11807] Upgrade camel-spring-redis to junit5
new d569ae0 [CAMEL-11807] Upgrade camel-jbpm to junit5
new 9c2681e [CAMEL-11807] Upgrade camel-catalog to junit5
new 2f80b96 [CAMEL-11807] Upgrade camel-main to junit5
new 37c7e5c [CAMEL-11807] Upgrade camel-zipfile to junit5
new e83ec84 [CAMEL-11807] Upgrade camel-kafka to junit5
new a202b6e [CAMEL-11807] Upgrade camel-openstack to junit5
new 267d51d [CAMEL-11807] Upgrade camel-threadpoolfactory-vertx to junit5
new e9e068d [CAMEL-11807] Fix a bunch of references to org.junit.Assert
The 43 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:
catalog/camel-catalog-lucene/pom.xml | 4 +-
.../catalog/lucene/CamelCatalogLuceneTest.java | 12 +-
catalog/camel-catalog-maven/pom.xml | 4 +-
.../catalog/maven/MavenArtifactProviderTest.java | 14 ++-
.../catalog/maven/MavenVersionManagerTest.java | 15 ++-
catalog/camel-catalog/pom.xml | 4 +-
.../apache/camel/catalog/components/aws-sns.json | 2 -
.../apache/camel/catalog/components/aws-sqs.json | 2 -
.../apache/camel/catalog/components/aws2-sns.json | 2 -
.../apache/camel/catalog/components/aws2-sqs.json | 2 -
.../camel/catalog/CamelCatalogCacheTest.java | 4 +-
.../camel/catalog/CamelCatalogJsonSchemaTest.java | 34 +++---
.../org/apache/camel/catalog/CamelCatalogTest.java | 16 +--
.../arangodb/ArangoCollectionDeleteTest.java | 4 +-
.../arangodb/ArangoCollectionFindByKeyTest.java | 4 +-
.../arangodb/ArangoCollectionSaveTest.java | 4 +-
.../component/arangodb/ArangoDbComponentTest.java | 4 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-azure-storage-blob/pom.xml | 2 +-
components/camel-azure-storage-queue/pom.xml | 2 +-
components/camel-bean-validator/pom.xml | 2 +-
components/camel-beanstalk/pom.xml | 2 +-
.../ResultSetConversionStrategiesTest.java | 6 +-
.../consul/cloud/ConsulServiceDiscoveryTest.java | 2 +-
components/camel-couchdb/pom.xml | 2 +-
components/camel-cxf-transport/pom.xml | 2 +-
components/camel-cxf/pom.xml | 2 +-
.../camel/component/fhir/FhirConfigurationIT.java | 4 +-
.../FhirXmlDataformatErrorHandlerSpringTest.java | 1 -
components/camel-ftp/pom.xml | 2 +-
components/camel-gson/pom.xml | 2 +-
.../camel/component/ipfs/SimpleIPFSTest.java | 14 +--
.../jbpm/server/CamelKieServerExtensionTest.java | 6 +-
components/camel-jing/pom.xml | 6 +-
.../component/validator/jing/RNCRouteTest.java | 4 +-
.../component/validator/jing/RNGRouteTest.java | 4 +-
.../camel/component/kafka/KafkaEndpointTest.java | 10 +-
.../camel/component/kafka/KafkaProducerTest.java | 30 ++---
.../serde/DefaultKafkaHeaderDeserializerTest.java | 4 +-
.../serde/DefaultKafkaHeaderSerializerTest.java | 2 +-
.../kafka/clients/consumer/KafkaConsumerTest.java | 2 +-
.../apache/camel/component/ldap/LdapRouteTest.java | 2 +-
components/camel-lzf/pom.xml | 2 +-
.../camel/dataformat/lzf/LZFDataFormatTest.java | 8 +-
components/camel-msv/pom.xml | 2 +-
.../component/validator/msv/RelaxNGRouteTest.java | 4 +-
components/camel-openstack/pom.xml | 6 +-
.../openstack/AbstractProducerTestSupport.java | 10 +-
.../cinder/CinderProducerTestSupport.java | 10 +-
.../openstack/cinder/VolumeProducerTest.java | 18 +--
.../cinder/VolumeSnapshotProducerTest.java | 18 +--
.../openstack/glance/GlanceProducerTest.java | 18 +--
.../openstack/keystone/DomainProducerTest.java | 18 +--
.../openstack/keystone/GroupProducerTest.java | 18 +--
.../keystone/KeystoneProducerTestSupport.java | 10 +-
.../openstack/keystone/ProjectProducerTest.java | 18 +--
.../openstack/keystone/RegionProducerTest.java | 18 +--
.../openstack/keystone/UserProducerTest.java | 18 +--
.../openstack/neutron/NetworkProducerTest.java | 18 +--
.../neutron/NeutronProducerTestSupport.java | 10 +-
.../openstack/neutron/PortProducerTest.java | 18 +--
.../openstack/neutron/RouterProducerTest.java | 18 +--
.../openstack/neutron/SubnetProducerTest.java | 18 +--
.../openstack/nova/FlavorProducerTest.java | 20 ++--
.../openstack/nova/KeypairProducerTest.java | 16 +--
.../openstack/nova/NovaProducerTestSupport.java | 10 +-
.../openstack/nova/ServerProducerTest.java | 20 ++--
.../openstack/swift/ContainerProducerTest.java | 16 +--
.../openstack/swift/ObjectProducerTest.java | 14 +--
.../openstack/swift/SwiftProducerTestSupport.java | 10 +-
components/camel-optaplanner/pom.xml | 6 +-
.../optaplanner/OptaPlannerAsyncSolverTest.java | 9 +-
.../optaplanner/OptaPlannerConsumerTest.java | 9 +-
.../optaplanner/OptaPlannerDaemonSolverTest.java | 8 +-
.../optaplanner/OptaPlannerSyncSolverTest.java | 9 +-
components/camel-printer/pom.xml | 8 +-
.../camel/component/printer/PrinterPrintTest.java | 35 +++---
components/camel-pulsar/pom.xml | 10 +-
.../component/pulsar/PulsarComponentTest.java | 13 ++-
.../pulsar/PulsarConcurrentConsumerInTest.java | 4 +-
.../pulsar/PulsarConcurrentProducerInTest.java | 2 +-
.../pulsar/PulsarConsumerAcknowledgementTest.java | 8 +-
.../pulsar/PulsarConsumerDeadLetterPolicyTest.java | 8 +-
.../pulsar/PulsarConsumerInAsynchronousTest.java | 4 +-
.../pulsar/PulsarConsumerInSynchronousTest.java | 4 +-
.../component/pulsar/PulsarConsumerInTest.java | 2 +-
.../PulsarConsumerNoAcknowledgementTest.java | 2 +-
.../pulsar/PulsarConsumerPatternInTest.java | 2 +-
.../pulsar/PulsarCustomMessageReceiptTest.java | 6 +-
.../camel/component/pulsar/PulsarEndpointTest.java | 8 +-
.../pulsar/PulsarProducerHeadersInTest.java | 2 +-
.../component/pulsar/PulsarProducerInTest.java | 2 +-
.../PulsarProducerUndefinedProducerNameInTest.java | 2 +-
.../camel/component/pulsar/PulsarTestSupport.java | 23 +++-
.../component/pulsar/utils/PulsarUtilsTest.java | 10 +-
.../ConsumerCreationStrategyFactoryTest.java | 12 +-
.../utils/message/PulsarMessageUtilsTest.java | 4 +-
.../quickfixj/QuickfixjComponentTest.java | 10 +-
.../quickfixj/QuickfixjLazyProducerTest.java | 2 +-
.../component/rabbitmq/RabbitConsumerHangTest.java | 2 +-
.../component/rabbitmq/RabbitMQConsumerTest.java | 4 +-
.../component/rabbitmq/RabbitMQProducerTest.java | 6 +-
.../integration/RabbitMQDeadLetterArgsIntTest.java | 24 ++--
.../RabbitMQDeadLetterRoutingKeyIntTest.java | 2 +-
.../RabbitMQTemporaryQueueAutoRecoveryIntTest.java | 4 +-
.../reactive/streams/DelayedMonoPublisherTest.java | 4 +-
components/camel-resilience4j/pom.xml | 2 +-
.../ResilienceExistingCircuitBreakerTest.java | 7 +-
.../ResilienceInheritErrorHandlerTest.java | 4 +-
.../resilience4j/ResilienceManagementTest.java | 6 +-
.../ResilienceRouteBulkheadFallbackTest.java | 4 +-
.../ResilienceRouteBulkheadOkTest.java | 4 +-
.../resilience4j/ResilienceRouteFallbackTest.java | 4 +-
.../ResilienceRouteFallbackViaNetworkTest.java | 8 +-
.../resilience4j/ResilienceRouteOkTest.java | 6 +-
.../resilience4j/ResilienceRouteRejectedTest.java | 6 +-
.../resilience4j/ResilienceTimeoutTest.java | 12 +-
.../ResilienceTimeoutThreadPoolTest.java | 15 ++-
.../ResilienceTimeoutWithFallbackTest.java | 6 +-
.../SpringResilienceRouteFallbackTest.java | 4 +-
.../resilience4j/SpringResilienceRouteOkTest.java | 4 +-
...alesforceJwtBearerTokenFlowIntegrationTest.java | 6 +-
components/camel-sap-netweaver/pom.xml | 2 +-
.../sap/netweaver/NetWeaverFlightDataTest.java | 4 +-
.../netweaver/NetWeaverFlightDataVelocityTest.java | 4 +-
.../sjms/batch/EmbeddedActiveMQBroker.java | 2 -
.../camel/component/slack/SlackConsumerTest.java | 7 +-
components/camel-spring-redis/pom.xml | 4 +-
.../redis/RedisComponentSpringIntegrationTest.java | 10 +-
.../camel/component/redis/RedisConnectionTest.java | 8 +-
.../redis/RedisConsumerIntegrationTest.java | 6 +-
.../camel/component/redis/RedisConsumerTest.java | 10 +-
.../apache/camel/component/redis/RedisGeoTest.java | 11 +-
.../camel/component/redis/RedisHashTest.java | 8 +-
.../apache/camel/component/redis/RedisKeyTest.java | 8 +-
.../camel/component/redis/RedisListTest.java | 8 +-
.../redis/RedisProducerIntegrationTest.java | 8 +-
.../apache/camel/component/redis/RedisSetTest.java | 8 +-
.../camel/component/redis/RedisSortedSetTest.java | 8 +-
.../camel/component/redis/RedisStringTest.java | 9 +-
.../camel/component/redis/RedisTestSupport.java | 7 +-
.../component/redis/RedisTransactionTest.java | 7 +-
.../idempotent/RedisIdempotentRepositoryTest.java | 14 +--
...sStringIdempotentRepositoryIntegrationTest.java | 12 +-
.../RedisStringIdempotentRepositoryTest.java | 13 +--
.../spring/ws/ProducerRemoteRouteTest.java | 5 +-
.../spring/ws/SoapResponseAttachmentTest.java | 3 +-
components/camel-swagger-java/pom.xml | 2 +-
.../org/apache/camel/test/AvailablePortFinder.java | 40 ++++++-
.../AvailablePortFinderPropertiesFunction.java | 0
components/camel-threadpoolfactory-vertx/pom.xml | 6 +-
.../camel/reactive/SplitCustomThreadPoolTest.java | 9 +-
.../reactive/SplitParallelLookupVertxTest.java | 9 +-
.../apache/camel/reactive/SplitParallelTest.java | 9 +-
components/camel-undertow-spring-security/pom.xml | 2 +-
.../AbstractSpringSecurityBearerTokenTest.java | 6 +-
.../component/spring/security/NoTokenTest.java | 9 +-
.../security/SpringSecurityBearerTokenTest.java | 10 +-
components/camel-workday/pom.xml | 6 +-
.../apache/camel/WorkdayCommonAPIProducerTest.java | 19 ++--
.../apache/camel/WorkdayReportProducerTest.java | 9 +-
components/camel-xj/pom.xml | 2 +-
.../camel/component/xj/J2XInputStreamTest.java | 4 +-
.../camel/component/xj/J2XOutputBytesTest.java | 4 +-
.../camel/component/xj/J2XOutputFileTest.java | 4 +-
.../camel/component/xj/J2XOutputIdentityTest.java | 4 +-
.../camel/component/xj/J2XOutputStringTest.java | 4 +-
.../component/xj/JsonXmlStreamReaderTest.java | 2 +-
.../camel/component/xj/X2JInputStreamTest.java | 4 +-
.../camel/component/xj/X2JOutputBytesTest.java | 4 +-
.../camel/component/xj/X2JOutputFileTest.java | 4 +-
.../camel/component/xj/X2JOutputIdentityTest.java | 4 +-
.../camel/component/xj/X2JOutputStringTest.java | 4 +-
.../org/apache/camel/component/xj/XJTestUtils.java | 5 +-
.../component/xj/XmlJsonStreamWriterTest.java | 2 +-
components/camel-xmlsecurity/pom.xml | 11 +-
.../component/xmlsecurity/ECDSASignatureTest.java | 17 ++-
.../xmlsecurity/SignatureAlgorithmTest.java | 10 +-
.../xmlsecurity/SignatureDigestMethodTest.java | 10 +-
.../xmlsecurity/SpringXmlSignatureTest.java | 2 +-
.../xmlsecurity/XAdESSignaturePropertiesTest.java | 121 +++++++++++++--------
.../component/xmlsecurity/XmlSignatureTest.java | 68 ++++++------
.../xmlsecurity/EncryptionAlgorithmTest.java | 8 +-
.../SpringXmlSecurityDataFormatTest.java | 7 +-
...ngXmlSecurityDataFormatWithKeyPasswordTest.java | 7 +-
.../camel/dataformat/xmlsecurity/TestHelper.java | 12 +-
.../xmlsecurity/XMLEncryption11Test.java | 8 +-
.../xmlsecurity/XMLSecurityConcurrencyTest.java | 10 +-
.../xmlsecurity/XMLSecurityDataFormatTest.java | 15 +--
components/camel-xmpp/pom.xml | 2 +-
.../camel/component/xmpp/GoogleTalkTest.java | 10 +-
.../camel/component/xmpp/UriConfigurationTest.java | 16 +--
.../component/xmpp/XmppDeferredConnectionTest.java | 12 +-
.../component/xmpp/XmppMultiUserChatTest.java | 12 +-
.../component/xmpp/XmppProducerConcurrentTest.java | 14 ++-
.../component/xmpp/XmppRobustConnectionTest.java | 18 +--
.../camel/component/xmpp/XmppRouteChatTest.java | 12 +-
...ppRouteMultipleProducersSingleConsumerTest.java | 12 +-
.../apache/camel/component/xmpp/XmppRouteTest.java | 39 +++----
components/camel-xstream/pom.xml | 6 +-
.../MarshalDomainObjectJSONDropRootNodeTest.java | 1 -
.../camel/dataformat/xstream/MarshalListTest.java | 4 +-
.../xstream/UnmarshalThenMarshalTest.java | 14 ++-
.../dataformat/xstream/XStreamConcurrencyTest.java | 6 +-
.../xstream/XStreamConfigurationTest.java | 12 +-
.../xstream/XStreamDataFormatDriverConfigTest.java | 6 +-
components/camel-yammer/pom.xml | 6 +-
.../yammer/YammerComponentTestSupport.java | 2 +-
.../yammer/YammerMessageAndUserRouteTest.java | 6 +-
.../yammer/YammerMessageProducerRouteTest.java | 4 +-
.../component/yammer/YammerMessageRouteTest.java | 4 +-
.../yammer/YammerMessagesConsumerOptionTest.java | 4 +-
.../yammer/YammerMultipleUsersRouteTest.java | 8 +-
.../yammer/YammerUserPollEnrichRouteTest.java | 8 +-
.../component/yammer/YammerUserRouteTest.java | 4 +-
components/camel-zip-deflater/pom.xml | 6 +-
.../deflater/GzipDataFormatFileDeleteTest.java | 17 +--
.../GzipDataFormatFileUnmarshalDeleteTest.java | 16 +--
.../dataformat/deflater/GzipDataFormatTest.java | 8 +-
.../ZipDeflaterDataFormatFileDeleteTest.java | 17 +--
...pDeflaterDataFormatFileUnmarshalDeleteTest.java | 15 ++-
.../deflater/ZipDeflaterDataFormatTest.java | 8 +-
components/camel-zipfile/pom.xml | 4 +-
.../zipfile/SpringZipSplitterRouteTest.java | 4 +-
.../dataformat/zipfile/ZipFileDataFormatTest.java | 36 +++---
.../zipfile/ZipFileIteratorDataFormatTest.java | 4 +-
.../zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../zipfile/ZipFileSplitAndDeleteTest.java | 15 ++-
.../zipfile/ZipFileSplitOneFileTest.java | 10 +-
.../zipfile/ZipSplitterRouteIssueTest.java | 10 +-
.../dataformat/zipfile/ZipSplitterRouteTest.java | 4 +-
.../AggregationStrategyWithFilenameHeaderTest.java | 19 ++--
.../AggregationStrategyWithPreservationTest.java | 24 ++--
.../ZipAggregationStrategyEmptyFileTest.java | 18 ++-
.../zipfile/ZipAggregationStrategyTest.java | 18 ++-
components/camel-zipkin/pom.xml | 7 +-
.../org/apache/camel/zipkin/CamelRequestTest.java | 2 +-
.../camel/zipkin/ManagedZipkinSimpleRouteTest.java | 11 +-
.../camel/zipkin/SpringZipkinSimpleRouteTest.java | 6 +-
.../apache/camel/zipkin/ZipkinABCRouteTest.java | 6 +-
.../camel/zipkin/ZipkinClientCustomTagsTest.java | 4 +-
.../zipkin/ZipkinClientRecipientListRouteTest.java | 6 +-
.../camel/zipkin/ZipkinMDCScopeDecoratorTest.java | 6 +-
.../zipkin/ZipkinMultiServerNoClientTest.java | 4 +-
.../camel/zipkin/ZipkinMulticastRouteTest.java | 6 +-
.../camel/zipkin/ZipkinOneRouteFallbackTest.java | 4 +-
.../apache/camel/zipkin/ZipkinOneRouteTest.java | 4 +-
.../camel/zipkin/ZipkinProducerSpanKindTest.java | 4 +-
.../camel/zipkin/ZipkinRecipientListRouteTest.java | 6 +-
.../camel/zipkin/ZipkinRouteConcurrentTest.java | 6 +-
.../camel/zipkin/ZipkinServerMulticastTest.java | 4 +-
.../zipkin/ZipkinSimpleFallbackRouteTest.java | 6 +-
.../zipkin/ZipkinSimpleLogStreamsRouteTest.java | 6 +-
.../apache/camel/zipkin/ZipkinSimpleRouteTest.java | 6 +-
.../zipkin/ZipkinSpanReporterInRegistryTest.java | 7 +-
.../apache/camel/zipkin/ZipkinTimerRouteTest.java | 6 +-
.../org/apache/camel/zipkin/ZipkinTracerTest.java | 4 +-
.../apache/camel/zipkin/ZipkinTwoRouteTest.java | 4 +-
.../camel/zipkin/http/ZipkinAutoConfigureHttp.java | 4 +-
.../zipkin/scribe/ZipkinAutoConfigureScribe.java | 4 +-
components/camel-zookeeper-master/pom.xml | 10 ++
.../MasterEndpointFailoverTest.java | 10 +-
.../zookeepermaster/MasterEndpointTest.java | 13 ++-
.../zookeepermaster/MasterQuartzEndpointTest.java | 6 +-
.../component/zookeepermaster/group/GroupTest.java | 35 +++---
.../group/internal/ZooKeeperGroupTest.java | 12 +-
components/camel-zookeeper/pom.xml | 20 +++-
.../component/zookeeper/ConsumeChildrenTest.java | 7 +-
.../camel/component/zookeeper/ConsumeDataTest.java | 7 +-
.../zookeeper/NaturalSortComparatorTest.java | 4 +-
.../zookeeper/ZooKeeperCuratorHelperTest.java | 10 +-
.../component/zookeeper/ZooKeeperEndpointTest.java | 12 +-
.../zookeeper/ZooKeeperManagedEndpointTest.java | 6 +-
.../component/zookeeper/ZooKeeperProducerTest.java | 5 +-
.../component/zookeeper/ZooKeeperTestSupport.java | 8 +-
.../component/zookeeper/ZooKeeperUtilsTest.java | 5 +-
.../zookeeper/ZookeeperConnectionManagerTest.java | 4 +-
.../cloud/SpringZooKeeperServiceCallRouteTest.java | 4 +-
.../cloud/ZooKeeperServiceCallRouteTest.java | 4 +-
.../cloud/ZooKeeperServiceDiscoveryTest.java | 9 +-
.../ZooKeeperServiceRegistrationTestBase.java | 11 +-
...ngZooKeeperClusteredRouteConfigurationTest.java | 7 +-
.../ZooKeeperClusteredRoutePolicyFactoryTest.java | 10 +-
.../cluster/ZooKeeperClusteredRoutePolicyTest.java | 10 +-
.../zookeeper/cluster/ZooKeeperMasterTest.java | 10 +-
.../zookeeper/operations/AnyOfOperationTest.java | 4 +-
.../operations/ChildrenChangedOperationTest.java | 4 +-
.../zookeeper/operations/CreateOperationTest.java | 9 +-
.../operations/DataChangedOperationTest.java | 7 +-
.../operations/ExistenceChangedOperationTest.java | 6 +-
.../operations/ExistenceOperationTest.java | 5 +-
.../operations/FutureEventDrivenOperationTest.java | 4 +-
.../zookeeper/operations/SetDataOperationTest.java | 8 +-
.../builder/endpoint/FtpRawParameterTest.java | 6 +-
.../camel/builder/endpoint/LogAdvancedTest.java | 2 +-
.../camel/builder/endpoint/LogToDAdvancedTest.java | 2 +-
.../camel/builder/endpoint/NormalizedUriTest.java | 2 +-
.../apache/camel/builder/endpoint/PahoTest.java | 4 +-
.../apache/camel/builder/endpoint/QuartzTest.java | 5 +-
.../builder/endpoint/RabbitMQMultiValueTest.java | 4 +-
.../camel/builder/endpoint/TimerAdvancedTest.java | 2 +-
core/camel-main/pom.xml | 2 +-
.../apache/camel/main/MainFaultToleranceTest.java | 18 +--
.../camel/main/MainPropertyPlaceholderTest.java | 1 -
.../main/MainPropertyPlaceholderWithEnvTest.java | 2 +-
.../java/org/apache/camel/main/MainRestTest.java | 23 ++--
.../apache/camel/main/MainRouteTemplateTest.java | 7 +-
.../apache/camel/main/xml/MainXmlTemplateTest.java | 1 -
308 files changed, 1531 insertions(+), 1145 deletions(-)
copy components/{camel-test => camel-test-junit5}/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java (100%)
[camel] 25/43: [CAMEL-11807] Upgrade camel-couchdb to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 87be882c2d85308e5c137339495f9142e3032381
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:59:48 2020 +0200
[CAMEL-11807] Upgrade camel-couchdb to junit5
---
components/camel-couchdb/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index 4e7a31d..80f5006 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 09/43: [CAMEL-11807] Upgrade camel-zookeeper-master to
junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fc1a1406759ae695127ff223be5e32bd73d5731c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:09:02 2020 +0200
[CAMEL-11807] Upgrade camel-zookeeper-master to junit5
---
components/camel-zookeeper-master/pom.xml | 10 +++++++
.../MasterEndpointFailoverTest.java | 10 +++----
.../zookeepermaster/MasterEndpointTest.java | 13 ++++----
.../zookeepermaster/MasterQuartzEndpointTest.java | 6 ++--
.../component/zookeepermaster/group/GroupTest.java | 35 +++++++++++-----------
.../group/internal/ZooKeeperGroupTest.java | 12 ++++----
6 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index f4e4104..eb06999 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -117,6 +117,16 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-quartz</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
index c5d7072..72f8a83 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
@@ -25,9 +25,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
import org.apache.curator.framework.CuratorFramework;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@ public class MasterEndpointFailoverTest {
protected ZKContainer zkContainer = new ZKContainer();
protected CuratorFactoryBean zkClientBean = new CuratorFactoryBean();
- @Before
+ @BeforeEach
public void beforeRun() throws Exception {
zkContainer.start();
@@ -93,7 +93,7 @@ public class MasterEndpointFailoverTest {
result2Endpoint = consumerContext2.getEndpoint("mock:result2", MockEndpoint.class);
}
- @After
+ @AfterEach
public void afterRun() throws Exception {
consumerContext1.stop();
consumerContext2.stop();
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
index eba3ee5..af8343d 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
@@ -26,15 +26,16 @@ import org.apache.camel.Route;
import org.apache.camel.component.file.remote.SftpEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+@CamelSpringTest
@ContextConfiguration
-public class MasterEndpointTest extends AbstractJUnit4SpringContextTests {
+public class MasterEndpointTest {
@Autowired
protected CamelContext camelContext;
@@ -48,9 +49,9 @@ public class MasterEndpointTest extends AbstractJUnit4SpringContextTests {
public void testEndpoint() throws Exception {
// check the endpoint configuration
List<Route> registeredRoutes = camelContext.getRoutes();
- assertEquals("number of routes", 1, registeredRoutes.size());
+ assertEquals(1, registeredRoutes.size(), "number of routes");
MasterEndpoint endpoint = (MasterEndpoint) registeredRoutes.get(0).getEndpoint();
- assertEquals("wrong endpoint uri", "seda:bar", endpoint.getConsumerEndpointUri());
+ assertEquals("seda:bar", endpoint.getConsumerEndpointUri(), "wrong endpoint uri");
String expectedBody = "<matched/>";
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
index ee7941d..7ba6cde 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
@@ -19,13 +19,15 @@ package org.apache.camel.component.zookeepermaster;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+@CamelSpringTest
@ContextConfiguration
-public class MasterQuartzEndpointTest extends AbstractJUnit4SpringContextTests {
+public class MasterQuartzEndpointTest {
@Autowired
protected CamelContext camelContext;
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
index b5ea05e..3fb14a0 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
@@ -28,22 +28,21 @@ import org.apache.camel.component.zookeepermaster.ZKContainer;
import org.apache.camel.component.zookeepermaster.group.internal.ChildData;
import org.apache.camel.component.zookeepermaster.group.internal.ZooKeeperGroup;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryNTimes;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.SelinuxContext;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.test.util.AssertionErrors.assertNotEquals;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GroupTest {
private static final Logger LOGGER = LoggerFactory.getLogger(GroupTest.class);
@@ -99,13 +98,13 @@ public class GroupTest {
return container;
}
- @BeforeClass
+ @BeforeAll
public static void before() {
// workaround macos issue with docker/testcontainers expecting to use /tmp/ folder
beforeTmpdir = System.setProperty("java.io.tmpdir", "/tmp/");
}
- @AfterClass
+ @AfterAll
public static void after() {
if (beforeTmpdir != null) {
System.setProperty("java.io.tmpdir", beforeTmpdir);
@@ -164,13 +163,13 @@ public class GroupTest {
}
curator.close();
- assertTrue("first started is master", firsStartedIsMaster);
+ assertTrue(firsStartedIsMaster, "first started is master");
} finally {
if (container != null) {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -218,7 +217,7 @@ public class GroupTest {
}
try {
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
} catch (Throwable e) {
// ignore
}
@@ -264,7 +263,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -320,7 +319,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -369,7 +368,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -423,7 +422,7 @@ public class GroupTest {
TimeUnit.SECONDS.sleep(1);
}
- assertNotEquals("We see the updated version", version, group.getCurrentData().get(0).getStat().getVersion());
+ assertNotEquals(version, group.getCurrentData().get(0).getStat().getVersion(), "We see the updated version");
LOGGER.info("CurrentData:" + group.getCurrentData());
@@ -434,7 +433,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
index e1723f8..754702f 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
@@ -29,13 +29,13 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryOneTime;
import org.apache.zookeeper.data.Stat;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ZooKeeperGroupTest {
@@ -48,7 +48,7 @@ public class ZooKeeperGroupTest {
return AvailablePortFinder.getNextAvailable();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
int port = findFreePort();
curator = CuratorFrameworkFactory.builder()
@@ -61,7 +61,7 @@ public class ZooKeeperGroupTest {
// Starting curator and group is not necessary for the current tests.
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
group.close();
curator.close();
[camel] 43/43: [CAMEL-11807] Fix a bunch of references to
org.junit.Assert
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e9e068d0382a7369705617595226c488be8c1c08
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:53:27 2020 +0200
[CAMEL-11807] Fix a bunch of references to org.junit.Assert
---
.../arangodb/ArangoCollectionDeleteTest.java | 4 ++--
.../arangodb/ArangoCollectionFindByKeyTest.java | 4 ++--
.../arangodb/ArangoCollectionSaveTest.java | 4 ++--
.../component/arangodb/ArangoDbComponentTest.java | 4 ++--
.../ResultSetConversionStrategiesTest.java | 6 +++---
.../consul/cloud/ConsulServiceDiscoveryTest.java | 2 +-
.../camel/component/fhir/FhirConfigurationIT.java | 4 ++--
.../FhirXmlDataformatErrorHandlerSpringTest.java | 1 -
.../camel/component/ipfs/SimpleIPFSTest.java | 14 ++++++-------
.../apache/camel/component/ldap/LdapRouteTest.java | 2 +-
.../quickfixj/QuickfixjComponentTest.java | 10 ++++-----
.../quickfixj/QuickfixjLazyProducerTest.java | 2 +-
.../component/rabbitmq/RabbitConsumerHangTest.java | 2 +-
.../component/rabbitmq/RabbitMQConsumerTest.java | 4 ++--
.../component/rabbitmq/RabbitMQProducerTest.java | 6 +++---
.../integration/RabbitMQDeadLetterArgsIntTest.java | 24 ++++++++++++----------
.../RabbitMQDeadLetterRoutingKeyIntTest.java | 2 +-
.../RabbitMQTemporaryQueueAutoRecoveryIntTest.java | 4 ++--
.../reactive/streams/DelayedMonoPublisherTest.java | 4 ++--
...alesforceJwtBearerTokenFlowIntegrationTest.java | 6 +++---
.../camel/component/slack/SlackConsumerTest.java | 7 +++----
.../spring/ws/ProducerRemoteRouteTest.java | 5 ++---
.../spring/ws/SoapResponseAttachmentTest.java | 3 +--
.../builder/endpoint/FtpRawParameterTest.java | 6 +++---
.../camel/builder/endpoint/LogAdvancedTest.java | 2 +-
.../camel/builder/endpoint/LogToDAdvancedTest.java | 2 +-
.../camel/builder/endpoint/NormalizedUriTest.java | 2 +-
.../apache/camel/builder/endpoint/PahoTest.java | 4 ++--
.../apache/camel/builder/endpoint/QuartzTest.java | 5 ++---
.../builder/endpoint/RabbitMQMultiValueTest.java | 4 ++--
.../camel/builder/endpoint/TimerAdvancedTest.java | 2 +-
31 files changed, 74 insertions(+), 77 deletions(-)
diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java
index 5cca4ed..5558b1d 100644
--- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java
+++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java
@@ -26,8 +26,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.arangodb.ArangoDbConstants.MULTI_DELETE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
public class ArangoCollectionDeleteTest extends AbstractArangoDbTest {
diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java
index 67e046a..381db3a 100644
--- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java
+++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java
@@ -28,9 +28,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.arangodb.ArangoDbConstants.RESULT_CLASS_TYPE;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ArangoCollectionFindByKeyTest extends AbstractArangoDbTest {
private ArangoCollection collection;
diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java
index 58154f5..296618c 100644
--- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java
+++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.arangodb.ArangoDbConstants.MULTI_INSERT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ArangoCollectionSaveTest extends AbstractArangoDbTest {
diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java
index f5ce518..8e57469 100644
--- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java
+++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class ArangoDbComponentTest extends CamelTestSupport {
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java
index 8856375..d8ec63a 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java
@@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.cql.ResultSet;
import com.datastax.oss.driver.api.core.cql.Row;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
index 3711dab..40e8cec 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
@@ -32,7 +32,7 @@ import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.util.SocketUtils;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ConsulServiceDiscoveryTest extends ConsulTestSupport {
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index 6c6f5be..4bd102f 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.fhir.internal.FhirApiCollection;
import org.apache.camel.component.fhir.internal.FhirCreateApiMethod;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -81,7 +81,7 @@ public class FhirConfigurationIT extends AbstractFhirTestSupport {
assertEquals(5, interceptors.size());
long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
- Assert.assertEquals("Should not use reflection", 0, counter);
+ assertEquals(0, counter, "Should not use reflection");
}
@Override
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java
index c3a4181..e087f3b 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
index fbb0c25..218f0ff 100644
--- a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
+++ b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
@@ -29,11 +29,11 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assume;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
/*
@@ -77,7 +77,7 @@ public class SimpleIPFSTest {
assertTrue(resA.startsWith("0.4"), "Expecting 0.4 in: " + resA);
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is IPFS running");
- Assume.assumeFalse("IPFS is running", notRunning);
+ assumeFalse(notRunning, "IPFS is running");
}
}
}
@@ -103,7 +103,7 @@ public class SimpleIPFSTest {
assertEquals(SINGLE_HASH, res);
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is IPFS running");
- Assume.assumeFalse("IPFS is running", notRunning);
+ assumeFalse(notRunning, "IPFS is running");
}
}
}
@@ -131,7 +131,7 @@ public class SimpleIPFSTest {
assertEquals(RECURSIVE_HASH, res.get(9));
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is IPFS running");
- Assume.assumeFalse("IPFS is running", notRunning);
+ assumeFalse(notRunning, "IPFS is running");
}
}
}
@@ -156,7 +156,7 @@ public class SimpleIPFSTest {
verifyFileContent(res);
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is IPFS running");
- Assume.assumeFalse("IPFS is running", notRunning);
+ assumeFalse(notRunning, "IPFS is running");
}
}
}
@@ -182,7 +182,7 @@ public class SimpleIPFSTest {
verifyFileContent(new FileInputStream(res.toFile()));
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is IPFS running");
- Assume.assumeFalse("IPFS is running", notRunning);
+ assumeFalse(notRunning, "IPFS is running");
}
}
}
@@ -209,7 +209,7 @@ public class SimpleIPFSTest {
assertTrue(res.resolve("index.html").toFile().exists());
} catch (Exception e) {
boolean notRunning = e.getCause().getMessage().contains("Is IPFS running");
- Assume.assumeFalse("IPFS is running", notRunning);
+ assumeFalse(notRunning, "IPFS is running");
}
}
}
diff --git a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
index e477267..62e6ecb 100644
--- a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
+++ b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
index 81d99cd..3b6461d 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java
@@ -67,8 +67,8 @@ import quickfix.mina.ProtocolFactory;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class QuickfixjComponentTest {
private File settingsFile;
@@ -349,7 +349,7 @@ public class QuickfixjComponentTest {
// will start the component
camelContext.start();
- assertTrue("Session not created", latch.await(5000, TimeUnit.MILLISECONDS));
+ assertTrue(latch.await(5000, TimeUnit.MILLISECONDS), "Session not created");
component.stop();
@@ -406,7 +406,7 @@ public class QuickfixjComponentTest {
// will start the component
camelContext.start();
- assertTrue("Session not created", logonLatch.await(5000, TimeUnit.MILLISECONDS));
+ assertTrue(logonLatch.await(5000, TimeUnit.MILLISECONDS), "Session not created");
Endpoint producerEndpoint = component.createEndpoint(getEndpointUri(settingsFile.getName(), acceptorSessionID));
Producer producer = producerEndpoint.createProducer();
@@ -426,7 +426,7 @@ public class QuickfixjComponentTest {
producer2.process(exchange);
- assertTrue("Messages not received", messageLatch.await(5000, TimeUnit.MILLISECONDS));
+ assertTrue(messageLatch.await(5000, TimeUnit.MILLISECONDS), "Messages not received");
}
@Test
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
index 1e71767..9698dae 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
@@ -32,7 +32,7 @@ import quickfix.field.SenderCompID;
import quickfix.field.TargetCompID;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
@Disabled("Fails on CI server sometimes")
public class QuickfixjLazyProducerTest {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java
index f6505db..fea6025 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.mockito.Mockito;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
public class RabbitConsumerHangTest {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
index 3bb1757..27b6e66 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
@@ -28,8 +28,8 @@ import org.apache.camel.Processor;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
index 2335752..dd68bf4 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
@@ -34,9 +34,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
public class RabbitMQProducerTest {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
index ccd9044..755196c 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
@@ -31,9 +31,11 @@ import org.apache.camel.component.rabbitmq.RabbitMQEndpoint;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
import org.apache.camel.util.json.Jsoner;
-import org.junit.Assert;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest {
private static final String LOCAL_RABBITMQ_PARAMS = "hostname=localhost&portNumber=5672&username=cameltest&password=cameltest";
private static final String QUEUE = "queue";
@@ -107,8 +109,8 @@ public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest {
receivedEndpoint.assertIsSatisfied();
RabbitMQEndpoint endpoint = (RabbitMQEndpoint) context.getRoute("consumer").getEndpoint();
- Assert.assertNotNull(endpoint.getDlqArgs());
- Assert.assertEquals(10, endpoint.getDlqArgs().get("x-max-priority"));
+ assertNotNull(endpoint.getDlqArgs());
+ assertEquals(10, endpoint.getDlqArgs().get("x-max-priority"));
String rabbitApiResponse = template.requestBody(
String.format("http://localhost:%s/api/queues?authUsername=cameltest&authPassword=cameltest&authMethod=Basic&httpMethod=GET", DockerTestUtils.EXPOSE_PORT_MANAGEMENT),
@@ -120,15 +122,15 @@ public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest {
JsonObject queueSkipDeclareObject = (JsonObject) rabbitApiResponseJson.stream().filter(jsonQueueFilter(QUEUE_SKIP_DECLARE)).findAny().orElse(null);
JsonObject dlqSkipDeclareObject = (JsonObject) rabbitApiResponseJson.stream().filter(jsonQueueFilter(DLQ_SKIP_DECLARE)).findAny().orElse(null);
- Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ, rabbitApiResponse), dlqObject);
- Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE, rabbitApiResponse), queueObject);
- Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE_SKIP_DECLARE, rabbitApiResponse), queueObject);
- Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ_SKIP_DECLARE, rabbitApiResponse), dlqSkipDeclareObject);
+ assertNotNull(dlqObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ, rabbitApiResponse));
+ assertNotNull(queueObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE, rabbitApiResponse));
+ assertNotNull(queueObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE_SKIP_DECLARE, rabbitApiResponse));
+ assertNotNull(dlqSkipDeclareObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ_SKIP_DECLARE, rabbitApiResponse));
- Assert.assertEquals(BigDecimal.valueOf(10), dlqObject.getMap("arguments").get("x-max-priority"));
- Assert.assertEquals(BigDecimal.valueOf(5), dlqSkipDeclareObject.getMap("arguments").get("x-max-priority"));
- Assert.assertEquals("dlqexchange", queueObject.getMap("arguments").get("x-dead-letter-exchange"));
- Assert.assertEquals("anotherExchange", queueSkipDeclareObject.getMap("arguments").get("x-dead-letter-exchange"));
+ assertEquals(BigDecimal.valueOf(10), dlqObject.getMap("arguments").get("x-max-priority"));
+ assertEquals(BigDecimal.valueOf(5), dlqSkipDeclareObject.getMap("arguments").get("x-max-priority"));
+ assertEquals("dlqexchange", queueObject.getMap("arguments").get("x-dead-letter-exchange"));
+ assertEquals("anotherExchange", queueSkipDeclareObject.getMap("arguments").get("x-dead-letter-exchange"));
}
private Predicate<Object> jsonQueueFilter(String name) {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
index 664a470..4352fd6 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
@@ -38,7 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.camel.test.junit5.TestSupport.assertListSize;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RabbitMQDeadLetterRoutingKeyIntTest extends AbstractRabbitMQIntTest {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
index c9bad9b..9af56ce 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
@@ -31,8 +31,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
/**
* Integration test to check if temporary queue's name change is properly handled after auto recovering
diff --git a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java
index d89780d..41993b9 100644
--- a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java
+++ b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java
@@ -32,9 +32,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DelayedMonoPublisherTest {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java
index 010279a..7ebe7c5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.salesforce.api.dto.Limits;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assumptions.*;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SalesforceJwtBearerTokenFlowIntegrationTest extends CamelTestSupport {
@@ -40,8 +40,8 @@ public class SalesforceJwtBearerTokenFlowIntegrationTest extends CamelTestSuppor
final SalesforceComponent salesforce = new SalesforceComponent();
final SalesforceLoginConfig loginConfig = LoginConfigHelper.getLoginConfig();
- assumeNotNull(loginConfig.getKeystore());
- assumeNotNull(loginConfig.getKeystore().getResource());
+ assumeTrue(loginConfig.getKeystore() != null);
+ assumeTrue(loginConfig.getKeystore().getResource() != null);
// force authentication type to JWT
loginConfig.setType(AuthenticationType.JWT);
diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
index 7744d69..34bf7f4b 100644
--- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
+++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
@@ -27,12 +27,11 @@ import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClients;
-import org.hamcrest.CoreMatchers;
-import org.junit.Assume;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public class SlackConsumerTest extends CamelTestSupport {
@@ -62,8 +61,8 @@ public class SlackConsumerTest extends CamelTestSupport {
}
private void assumeCredentials() {
- Assume.assumeThat("Please specify a Slack access token", token, CoreMatchers.notNullValue());
- Assume.assumeThat("Please specify a Slack application webhook URL", hook, CoreMatchers.notNullValue());
+ assumeTrue(token != null, "Please specify a Slack access token");
+ assumeTrue(hook != null, "Please specify a Slack application webhook URL");
}
private void sendMessage(String message) throws IOException {
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java
index 81d3fe6..805163c 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java
@@ -26,10 +26,9 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@Disabled("Run manually, makes connection to external webservice")
@CamelSpringTest
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
index 8b91062..84fb04f 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
@@ -26,9 +26,8 @@ import org.apache.camel.attachment.AttachmentMessage;
import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@CamelSpringTest
@ContextConfiguration
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java
index fa6849f..51ce9c5 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.remote.FtpEndpoint;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpRawParameterTest extends ContextTestSupport {
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java
index 0e85a63..1be87b4 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class LogAdvancedTest extends ContextTestSupport {
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
index c9d1794..8d886f1 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class LogToDAdvancedTest extends ContextTestSupport {
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java
index 67e648e..5a60922 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class NormalizedUriTest extends CamelTestSupport {
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java
index f4445a5..b6087a8 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.endpoint.dsl.PahoEndpointBuilderFactory;
import org.apache.camel.component.paho.PahoEndpoint;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class PahoTest extends ContextTestSupport {
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java
index 7c78310..c403e96 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java
@@ -22,9 +22,8 @@ import org.apache.camel.builder.endpoint.dsl.QuartzEndpointBuilderFactory;
import org.apache.camel.component.quartz.QuartzEndpoint;
import org.junit.jupiter.api.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class QuartzTest extends ContextTestSupport {
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java
index 50af2d4..e96638a 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.builder.endpoint.dsl.RabbitMQEndpointBuilderFactory;
import org.apache.camel.component.rabbitmq.RabbitMQEndpoint;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RabbitMQMultiValueTest extends ContextTestSupport {
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
index 8c3486a..6b6d4ec 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.ExceptionHandler;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TimerAdvancedTest extends ContextTestSupport {
[camel] 10/43: [CAMEL-11807] Upgrade camel-zookeeper to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0876ea8b235a9700db3f3637aab75c61ba455ade
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:17:07 2020 +0200
[CAMEL-11807] Upgrade camel-zookeeper to junit5
---
.../org/apache/camel/test/AvailablePortFinder.java | 40 +++++++-
.../AvailablePortFinderPropertiesFunction.java | 105 +++++++++++++++++++++
components/camel-zookeeper/pom.xml | 20 +++-
.../component/zookeeper/ConsumeChildrenTest.java | 7 +-
.../camel/component/zookeeper/ConsumeDataTest.java | 7 +-
.../zookeeper/NaturalSortComparatorTest.java | 4 +-
.../zookeeper/ZooKeeperCuratorHelperTest.java | 10 +-
.../component/zookeeper/ZooKeeperEndpointTest.java | 12 ++-
.../zookeeper/ZooKeeperManagedEndpointTest.java | 6 +-
.../component/zookeeper/ZooKeeperProducerTest.java | 5 +-
.../component/zookeeper/ZooKeeperTestSupport.java | 8 +-
.../component/zookeeper/ZooKeeperUtilsTest.java | 5 +-
.../zookeeper/ZookeeperConnectionManagerTest.java | 4 +-
.../cloud/SpringZooKeeperServiceCallRouteTest.java | 4 +-
.../cloud/ZooKeeperServiceCallRouteTest.java | 4 +-
.../cloud/ZooKeeperServiceDiscoveryTest.java | 9 +-
.../ZooKeeperServiceRegistrationTestBase.java | 11 ++-
...ngZooKeeperClusteredRouteConfigurationTest.java | 7 +-
.../ZooKeeperClusteredRoutePolicyFactoryTest.java | 10 +-
.../cluster/ZooKeeperClusteredRoutePolicyTest.java | 10 +-
.../zookeeper/cluster/ZooKeeperMasterTest.java | 10 +-
.../zookeeper/operations/AnyOfOperationTest.java | 4 +-
.../operations/ChildrenChangedOperationTest.java | 4 +-
.../zookeeper/operations/CreateOperationTest.java | 9 +-
.../operations/DataChangedOperationTest.java | 7 +-
.../operations/ExistenceChangedOperationTest.java | 6 +-
.../operations/ExistenceOperationTest.java | 5 +-
.../operations/FutureEventDrivenOperationTest.java | 4 +-
.../zookeeper/operations/SetDataOperationTest.java | 8 +-
29 files changed, 270 insertions(+), 75 deletions(-)
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
index a6a38bd..10f2d76 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
@@ -45,14 +45,46 @@ public final class AvailablePortFinder {
* @return the available port
*/
public static int getNextAvailable() {
+ return probePort(0);
+ }
+
+ /**
+ * Gets the next available port in the given range.
+ *
+ * @param fromPort port number start range.
+ * @param toPort port number end range.
+ *
+ * @throws IllegalStateException if there are no ports available
+ * @return the available port
+ */
+ public static int getNextAvailable(int fromPort, int toPort) {
+ for (int i = fromPort; i <= toPort; i++) {
+ try {
+ return probePort(i);
+ } catch (IllegalStateException e) {
+ // do nothing, let's try the next port
+ }
+ }
+ throw new IllegalStateException("Cannot find free port");
+ }
+
+ /**
+ * Probe a port to see if it is free
+ *
+ * @param port an integer port number to be tested. If port is 0, then the next available port is returned.
+ * @throws IllegalStateException if the port is not free or, in case of port 0, if there are no ports available at all.
+ * @return the port number itself if the port is free or, in case of port 0, the first available port number.
+ */
+ private static int probePort(int port) {
try (ServerSocket ss = new ServerSocket()) {
ss.setReuseAddress(true);
- ss.bind(new InetSocketAddress((InetAddress) null, 0), 1);
- int port = ss.getLocalPort();
- LOG.info("getNextAvailable() -> {}", port);
- return port;
+ ss.bind(new InetSocketAddress((InetAddress) null, port), 1);
+ int probedPort = ss.getLocalPort();
+ LOG.info("Available port is -> {}", probedPort);
+ return probedPort;
} catch (IOException e) {
throw new IllegalStateException("Cannot find free port", e);
}
}
+
}
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
new file mode 100644
index 0000000..ad6ed7c
--- /dev/null
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.camel.spi.PropertiesFunction;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
+
+/**
+ * A {@link PropertiesFunction} that reserves network ports and place them in a cache for reuse.
+ * <p/>
+ * The first time the function is invoked for a given name, an unused network port is determined and cached
+ * in an hash map with the given name as key so each time this function is invoked for the same name, the
+ * previously discovered port will be returned.
+ * <p/>
+ * This is useful for testing purpose where you can write a route like:
+ * <pre>{@code
+ * from("undertow:http://0.0.0.0:{{available-port:server-port}}")
+ * .to("mock:result");
+ * }</pre>
+ * And then you can invoke with {@link org.apache.camel.ProducerTemplate} like:
+ * <pre>{@code
+ * template.sendBody("undertow:http://0.0.0.0:{{available-port:server-port}}", "the body");
+ * }</pre>
+ * Doing so avoid the need to compute the port and pass it to the various method or store it as a global
+ * variable in the test class.
+ *
+ * @see AvailablePortFinder
+ */
+public class AvailablePortFinderPropertiesFunction implements PropertiesFunction {
+ private final Map<String, String> portMapping;
+
+ public AvailablePortFinderPropertiesFunction() {
+ this.portMapping = new ConcurrentHashMap<>();
+ }
+
+ @Override
+ public String getName() {
+ return "available-port";
+ }
+
+ @Override
+ public String apply(String remainder) {
+ if (ObjectHelper.isEmpty(remainder)) {
+ return remainder;
+ }
+
+ String name = StringHelper.before(remainder, ":");
+ String range = StringHelper.after(remainder, ":");
+
+ if (name == null) {
+ name = remainder;
+ }
+
+ final Integer from;
+ final Integer to;
+
+ if (range != null) {
+ String f = StringHelper.before(range, "-");
+ if (ObjectHelper.isEmpty(f)) {
+ throw new IllegalArgumentException("Unable to parse from range, range should be defined in the as from-to, got: " + range);
+ }
+
+ String t = StringHelper.after(range, "-");
+ if (ObjectHelper.isEmpty(t)) {
+ throw new IllegalArgumentException("Unable to parse to range, range should be defined in the as from-to, got: " + range);
+ }
+
+ from = Integer.parseInt(f);
+ to = Integer.parseInt(t);
+ } else {
+ from = null;
+ to = null;
+ }
+
+ return this.portMapping.computeIfAbsent(name, n -> {
+ final int port;
+
+ if (from != null && to != null) {
+ port = AvailablePortFinder.getNextAvailable(from, to);
+ } else {
+ port = AvailablePortFinder.getNextAvailable();
+ }
+
+ return Integer.toString(port);
+ });
+ }
+}
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 98924d2..24a8b51 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -100,6 +100,21 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-spring-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-management</artifactId>
<scope>test</scope>
</dependency>
@@ -159,11 +174,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-testcontainers-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
index 95c3cef..9749e35 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
@@ -28,7 +28,10 @@ import org.apache.camel.component.zookeeper.NaturalSortComparator.Order;
import org.apache.camel.support.ExchangeHelper;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.Stat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
public class ConsumeChildrenTest extends ZooKeeperTestSupport {
@@ -82,7 +85,7 @@ public class ConsumeChildrenTest extends ZooKeeperTestSupport {
for (int x = 0; x < received.size(); x++) {
Message zkm = mock.getReceivedExchanges().get(x).getIn();
int childCount = ((Stat)zkm.getHeader(ZooKeeperMessage.ZOOKEEPER_STATISTICS)).getNumChildren();
- assertNotSame("Num of children did not change", lastChildCount, childCount);
+ assertNotSame(lastChildCount, childCount, "Num of children did not change");
lastChildCount = childCount;
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
index f6afc16..5d8b9e5 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.zookeeper.KeeperException.NodeExistsException;
import org.apache.zookeeper.Watcher.Event.EventType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsumeDataTest extends ZooKeeperTestSupport {
@@ -69,7 +72,7 @@ public class ConsumeDataTest extends ZooKeeperTestSupport {
if (!EventType.NodeDeleted.equals(expectedEventTypes[i])) {
// As a delete event does not carry statistics, ignore it in the version check.
int version = ZooKeeperMessage.getStatistics(mock.getExchanges().get(i).getIn()).getVersion();
- assertTrue("Version did not increase", lastVersion < version);
+ assertTrue(lastVersion < version, "Version did not increase");
lastVersion = version;
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
index f58af8a..e06a432 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
@@ -22,9 +22,9 @@ import java.util.Collections;
import java.util.List;
import org.apache.camel.component.zookeeper.NaturalSortComparator.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class NaturalSortComparatorTest {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java
index b736152..854240b 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.zookeeper;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ZooKeeperCuratorHelperTest {
@@ -40,8 +40,8 @@ public class ZooKeeperCuratorHelperTest {
assertNotNull(curatorFramework);
ExponentialBackoffRetry retryPolicy = (ExponentialBackoffRetry) curatorFramework.getZookeeperClient().getRetryPolicy();
- assertEquals("retryPolicy.reconnectBaseSleepTime", configuration.getReconnectBaseSleepTime(), retryPolicy.getBaseSleepTimeMs());
- assertEquals("retryPolicy.reconnectMaxRetries", configuration.getReconnectMaxRetries(), retryPolicy.getN());
+ assertEquals(configuration.getReconnectBaseSleepTime(), retryPolicy.getBaseSleepTimeMs(), "retryPolicy.reconnectBaseSleepTime");
+ assertEquals(configuration.getReconnectMaxRetries(), retryPolicy.getN(), "retryPolicy.reconnectMaxRetries");
// retryPolicy.maxSleepMs not visible here
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
index d6d35a2..b863650 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
@@ -16,17 +16,19 @@
*/
package org.apache.camel.component.zookeeper;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ZooKeeperEndpointTest extends CamelTestSupport {
@Test
public void multipleZooKeeperServers() {
ZooKeeperEndpoint endpoint = context.getEndpoint("zookeeper:someserver1,someserver2:1234/zoo", ZooKeeperEndpoint.class);
- assertEquals("Get wrong number of servers", 2, endpoint.getConfiguration().getServers().size());
- assertEquals("The first server address is wrong", "someserver1", endpoint.getConfiguration().getServers().get(0));
- assertEquals("The second server address is wrong", "someserver2:1234", endpoint.getConfiguration().getServers().get(1));
+ assertEquals(2, endpoint.getConfiguration().getServers().size(), "Get wrong number of servers");
+ assertEquals("someserver1", endpoint.getConfiguration().getServers().get(0), "The first server address is wrong");
+ assertEquals("someserver2:1234", endpoint.getConfiguration().getServers().get(1), "The second server address is wrong");
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
index 2d775f5..c2eb292 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
@@ -23,9 +23,11 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.jmx.support.JmxUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@SuppressWarnings("all")
public class ZooKeeperManagedEndpointTest extends ZooKeeperTestSupport {
@Override
@@ -40,7 +42,7 @@ public class ZooKeeperManagedEndpointTest extends ZooKeeperTestSupport {
@Test
public void testEnpointConfigurationCanBeSetViaJMX() throws Exception {
Set s = getMBeanServer().queryNames(new ObjectName("org.apache.camel:type=endpoints,name=\"zookeeper:*\",*"), null);
- assertEquals("Could not find zookeper endpoint: " + s, 1, s.size());
+ assertEquals(1, s.size(), "Could not find zookeper endpoint: " + s);
ObjectName zepName = new ArrayList<ObjectName>(s).get(0);
verifyManagedAttribute(zepName, "Path", "/node");
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
index 509d203..a52e145 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
@@ -26,11 +26,14 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.zookeeper.operations.GetChildrenOperation;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.data.Stat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_CREATE_MODE;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_NODE;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_OPERATION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ZooKeeperProducerTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
index 7e620d7..aaefbc0 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
@@ -23,7 +23,7 @@ import java.util.concurrent.CountDownLatch;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -36,6 +36,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZooKeeperTestSupport extends ContainerAwareTestSupport {
protected String testPayload = "This is a test";
protected byte[] testPayloadBytes = testPayload.getBytes();
@@ -161,7 +165,7 @@ public class ZooKeeperTestSupport extends ContainerAwareTestSupport {
for (int x = 0; x < received.size(); x++) {
Message zkm = mock.getReceivedExchanges().get(x).getIn();
int version = ZooKeeperMessage.getStatistics(zkm).getVersion();
- assertTrue("Version did not increase", lastVersion < version);
+ assertTrue(lastVersion < version, "Version did not increase");
lastVersion = version;
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
index 7362b4c..5b37abc 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
@@ -21,12 +21,11 @@ import org.apache.camel.Message;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultMessage;
import org.apache.zookeeper.CreateMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getCreateMode;
import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getCreateModeFromString;
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ZooKeeperUtilsTest {
private CamelContext camelContext = new DefaultCamelContext();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
index bee0fd6..21bc6c7 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.zookeeper;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooKeeper.States;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ZookeeperConnectionManagerTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java
index 622668a..6e81161 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.test.AvailablePortFinderPropertiesFunction;
-import org.apache.camel.test.testcontainers.spring.ContainerAwareSpringTestSupport;
+import org.apache.camel.test.testcontainers.spring.junit5.ContainerAwareSpringTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -29,7 +29,7 @@ import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.testcontainers.containers.GenericContainer;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
index 671e364..6d2a0d2 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -32,7 +32,7 @@ import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ZooKeeperServiceCallRouteTest extends CamelTestSupport {
private static final int SERVER_PORT = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java
index a61b92c..3c76701 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java
@@ -29,11 +29,10 @@ import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.utils.CloseableUtils;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceInstance;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ZooKeeperServiceDiscoveryTest {
@@ -84,7 +83,7 @@ public class ZooKeeperServiceDiscoveryTest {
assertEquals(3, services.size());
for (ServiceDefinition service : services) {
- Assert.assertEquals(
+ assertEquals(
1,
instances.stream()
.filter(
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java
index 2dd5851..476a391 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java
@@ -25,7 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -34,8 +34,11 @@ import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public abstract class ZooKeeperServiceRegistrationTestBase extends CamelTestSupport {
protected static final String SERVICE_ID = UUID.randomUUID().toString();
@@ -75,7 +78,7 @@ public abstract class ZooKeeperServiceRegistrationTestBase extends CamelTestSupp
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
index 53f2721..72d579f 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
@@ -18,11 +18,14 @@ package org.apache.camel.component.zookeeper.cluster;
import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SpringZooKeeperClusteredRouteConfigurationTest extends CamelSpringTestSupport {
@Test
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
index 6a4ece9..e2cbc2a 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
@@ -30,11 +30,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class ZooKeeperClusteredRoutePolicyFactoryTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ZooKeeperClusteredRoutePolicyFactoryTest.class);
private static final List<String> CLIENTS = IntStream.range(0, 3).mapToObj(Integer::toString).collect(Collectors.toList());
@@ -62,8 +64,8 @@ public final class ZooKeeperClusteredRoutePolicyFactoryTest {
LATCH.await(1, TimeUnit.MINUTES);
SCHEDULER.shutdownNow();
- Assert.assertEquals(CLIENTS.size(), RESULTS.size());
- Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+ assertEquals(CLIENTS.size(), RESULTS.size());
+ assertTrue(RESULTS.containsAll(CLIENTS));
} finally {
if (container != null) {
container.stop();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
index 840332f..c32189a 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
@@ -30,11 +30,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class ZooKeeperClusteredRoutePolicyTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ZooKeeperClusteredRoutePolicyTest.class);
private static final List<String> CLIENTS = IntStream.range(0, 3).mapToObj(Integer::toString).collect(Collectors.toList());
@@ -62,8 +64,8 @@ public final class ZooKeeperClusteredRoutePolicyTest {
LATCH.await(1, TimeUnit.MINUTES);
SCHEDULER.shutdownNow();
- Assert.assertEquals(CLIENTS.size(), RESULTS.size());
- Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+ assertEquals(CLIENTS.size(), RESULTS.size());
+ assertTrue(RESULTS.containsAll(CLIENTS));
} finally {
if (container != null) {
container.stop();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
index cb195c5..e18f503 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
@@ -29,11 +29,13 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class ZooKeeperMasterTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ZooKeeperMasterTest.class);
private static final List<String> CLIENTS = IntStream.range(0, 3).mapToObj(Integer::toString).collect(Collectors.toList());
@@ -61,8 +63,8 @@ public final class ZooKeeperMasterTest {
LATCH.await(1, TimeUnit.MINUTES);
SCHEDULER.shutdownNow();
- Assert.assertEquals(CLIENTS.size(), RESULTS.size());
- Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+ assertEquals(CLIENTS.size(), RESULTS.size());
+ assertTrue(RESULTS.containsAll(CLIENTS));
} finally {
if (container != null) {
container.stop();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
index 2e24b32..69e93c6 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AnyOfOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
index 08911fe..f1a78d7 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ChildrenChangedOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
index a0a3265..7e8ce74 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
@@ -25,14 +25,17 @@ import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.ZooDefs.Perms;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.ACL;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CreateOperationTest extends ZooKeeperTestSupport {
private ZooKeeper connection;
- @Before
+ @BeforeEach
public void setupConnection() {
connection = getConnection();
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
index d2e752d..8e94cb5 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class DataChangedOperationTest extends ZooKeeperTestSupport {
@@ -43,6 +46,6 @@ public class DataChangedOperationTest extends ZooKeeperTestSupport {
connection.getData("/existedButWasDeleted", future, null);
client.delete("/existedButWasDeleted");
- assertEquals(null, future.get().getResult());
+ assertNull(future.get().getResult());
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java
index 79303ac..36f3cf7 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java
@@ -19,7 +19,11 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ExistenceChangedOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java
index 74f68af..43334ef 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ExistenceOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
index 3f0fcd0..b0b6472 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.data.Stat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class FutureEventDrivenOperationTest {
private String data = "Event Received";
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
index 53278a9..4bf9c15 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
@@ -18,14 +18,16 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SetDataOperationTest extends ZooKeeperTestSupport {
private ZooKeeper connection;
- @Before
+ @BeforeEach
public void setupConnection() {
connection = getConnection();
}
[camel] 11/43: [CAMEL-11807] Upgrade camel-undertow-spring-security
to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5cb4467ba3f1cab4cbd28d3890e51a87ae167c2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:18:23 2020 +0200
[CAMEL-11807] Upgrade camel-undertow-spring-security to junit5
---
components/camel-undertow-spring-security/pom.xml | 2 +-
.../spring/security/AbstractSpringSecurityBearerTokenTest.java | 6 +++---
.../apache/camel/component/spring/security/NoTokenTest.java | 9 ++++++---
.../spring/security/SpringSecurityBearerTokenTest.java | 10 +++++++---
4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/components/camel-undertow-spring-security/pom.xml b/components/camel-undertow-spring-security/pom.xml
index a0728d4..b4c6e5b 100644
--- a/components/camel-undertow-spring-security/pom.xml
+++ b/components/camel-undertow-spring-security/pom.xml
@@ -61,7 +61,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
index 2d5b68a..4fc1df2 100644
--- a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
+++ b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
@@ -33,8 +33,8 @@ import org.apache.camel.component.spring.security.keycloak.KeycloakRealmRoleConv
import org.apache.camel.component.spring.security.keycloak.KeycloakUsernameSubClaimAdapter;
import org.apache.camel.component.undertow.UndertowComponent;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
import org.springframework.security.oauth2.jwt.Jwt;
public abstract class AbstractSpringSecurityBearerTokenTest extends CamelTestSupport {
@@ -47,7 +47,7 @@ public abstract class AbstractSpringSecurityBearerTokenTest extends CamelTestSup
return mockFilter;
}
- @BeforeClass
+ @BeforeAll
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java
index 208f75d..1b77dbf 100644
--- a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java
+++ b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/NoTokenTest.java
@@ -20,8 +20,11 @@ import io.undertow.util.StatusCodes;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class NoTokenTest extends AbstractSpringSecurityBearerTokenTest {
@@ -35,7 +38,7 @@ public class NoTokenTest extends AbstractSpringSecurityBearerTokenTest {
template.requestBody("undertow:http://localhost:{{port}}/myapp",
"empty body",
String.class);
- Assert.fail("Access has to be denied");
+ fail("Access has to be denied");
} catch (CamelExecutionException e) {
HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode());
diff --git a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java
index 6080d84..2e2a19d 100644
--- a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java
+++ b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityBearerTokenTest.java
@@ -20,8 +20,12 @@ import io.undertow.util.StatusCodes;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class SpringSecurityBearerTokenTest extends AbstractSpringSecurityBearerTokenTest {
@@ -46,7 +50,7 @@ public class SpringSecurityBearerTokenTest extends AbstractSpringSecurityBearerT
template.requestBody("undertow:http://localhost:{{port}}/myapp",
"empty body",
String.class);
- Assert.fail("Access is denied");
+ fail("Access is denied");
} catch (CamelExecutionException e) {
HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode());
[camel] 32/43: [CAMEL-11807] Upgrade camel-sjms to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 727b849ed418ee2cb454056e31e4922ef031b521
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:47:27 2020 +0200
[CAMEL-11807] Upgrade camel-sjms to junit5
---
.../org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
index b3512e2..f001384 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
@@ -19,9 +19,7 @@ package org.apache.camel.component.sjms.batch;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
[camel] 23/43: [CAMEL-11807] Upgrade camel-bean-validator to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0993bd9865dc166701dc47e252b1ad45a8c552d0
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:57:59 2020 +0200
[CAMEL-11807] Upgrade camel-bean-validator to junit5
---
components/camel-bean-validator/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 8a0f008..9f710d9 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -74,7 +74,7 @@
<!-- for testing -->
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 38/43: [CAMEL-11807] Upgrade camel-main to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f80b965bd0f10ba489f8ea3348504dbb3ef8830
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:09:55 2020 +0200
[CAMEL-11807] Upgrade camel-main to junit5
---
core/camel-main/pom.xml | 2 +-
.../apache/camel/main/MainFaultToleranceTest.java | 18 +++++++++--------
.../camel/main/MainPropertyPlaceholderTest.java | 1 -
.../main/MainPropertyPlaceholderWithEnvTest.java | 2 +-
.../java/org/apache/camel/main/MainRestTest.java | 23 ++++++++++++----------
.../apache/camel/main/MainRouteTemplateTest.java | 7 ++++---
.../apache/camel/main/xml/MainXmlTemplateTest.java | 1 -
7 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml
index 9c0d86c..c8b8802 100644
--- a/core/camel-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -72,7 +72,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java
index 8c6c377..fcdac77 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java
@@ -19,9 +19,11 @@ package org.apache.camel.main;
import org.apache.camel.CamelContext;
import org.apache.camel.model.FaultToleranceConfigurationDefinition;
import org.apache.camel.model.ModelCamelContext;
-import org.junit.Assert;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class MainFaultToleranceTest {
@Test
@@ -41,17 +43,17 @@ public class MainFaultToleranceTest {
main.start();
CamelContext context = main.getCamelContext();
- Assert.assertNotNull(context);
+ assertNotNull(context);
ModelCamelContext mcc = context.adapt(ModelCamelContext.class);
FaultToleranceConfigurationDefinition def = mcc.getFaultToleranceConfiguration(null);
- Assert.assertNotNull(def);
+ assertNotNull(def);
- Assert.assertEquals("500", def.getDelay());
- Assert.assertEquals("123", def.getSuccessThreshold());
- Assert.assertEquals("20", def.getTimeoutPoolSize());
- Assert.assertEquals("555", def.getFailureRatio());
- Assert.assertEquals("true", def.getBulkheadEnabled());
+ assertEquals("500", def.getDelay());
+ assertEquals("123", def.getSuccessThreshold());
+ assertEquals("20", def.getTimeoutPoolSize());
+ assertEquals("555", def.getFailureRatio());
+ assertEquals("true", def.getBulkheadEnabled());
main.stop();
}
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java
index ade9280..a3c9c7b 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.main;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
public class MainPropertyPlaceholderTest {
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java
index ae00e08..9939d00 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java
@@ -24,7 +24,7 @@ import java.util.Properties;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MainPropertyPlaceholderWithEnvTest {
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java
index a663c72..70de886 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java
@@ -18,9 +18,12 @@ package org.apache.camel.main;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.RestConfiguration;
-import org.junit.Assert;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class MainRestTest {
@Test
@@ -40,17 +43,17 @@ public class MainRestTest {
main.start();
CamelContext context = main.getCamelContext();
- Assert.assertNotNull(context);
+ assertNotNull(context);
RestConfiguration def = context.getRestConfiguration();
- Assert.assertNotNull(def);
-
- Assert.assertEquals(1234, def.getPort());
- Assert.assertTrue(def.isUseXForwardHeaders());
- Assert.assertEquals("foo", def.getContextPath());
- Assert.assertEquals("bar", def.getApiContextPath());
- Assert.assertEquals("servlet", def.getComponent());
- Assert.assertEquals(RestConfiguration.RestBindingMode.json, def.getBindingMode());
+ assertNotNull(def);
+
+ assertEquals(1234, def.getPort());
+ assertTrue(def.isUseXForwardHeaders());
+ assertEquals("foo", def.getContextPath());
+ assertEquals("bar", def.getApiContextPath());
+ assertEquals("servlet", def.getComponent());
+ assertEquals(RestConfiguration.RestBindingMode.json, def.getBindingMode());
main.stop();
}
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java
index a46e0e4..fb4238e 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java
@@ -21,9 +21,10 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
-import org.junit.Assert;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MainRouteTemplateTest {
@Test
@@ -44,8 +45,8 @@ public class MainRouteTemplateTest {
main.start();
CamelContext context = main.getCamelContext();
- Assert.assertEquals(1, context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().size());
- Assert.assertEquals("mytemplate", context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().get(0).getId());
+ assertEquals(1, context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().size());
+ assertEquals("mytemplate", context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().get(0).getId());
MockEndpoint mock = context.getEndpoint("mock:cheese", MockEndpoint.class);
mock.expectedBodiesReceived("Hello Camel", "Hello World");
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java b/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java
index a6bf863..134a6ff 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.main.Main;
import org.apache.camel.model.ModelCamelContext;
import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
[camel] 34/43: [CAMEL-11807] Upgrade camel-pulsar to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 99f5084634dba7b1aefbd529bc27757a8c48bbc9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 14:22:45 2020 +0200
[CAMEL-11807] Upgrade camel-pulsar to junit5
---
components/camel-pulsar/pom.xml | 10 +++++-----
.../component/pulsar/PulsarComponentTest.java | 13 ++++++++----
.../pulsar/PulsarConcurrentConsumerInTest.java | 4 +++-
.../pulsar/PulsarConcurrentProducerInTest.java | 2 +-
.../pulsar/PulsarConsumerAcknowledgementTest.java | 8 +++++---
.../pulsar/PulsarConsumerDeadLetterPolicyTest.java | 8 +++++---
.../pulsar/PulsarConsumerInAsynchronousTest.java | 4 +++-
.../pulsar/PulsarConsumerInSynchronousTest.java | 4 +++-
.../component/pulsar/PulsarConsumerInTest.java | 2 +-
.../PulsarConsumerNoAcknowledgementTest.java | 2 +-
.../pulsar/PulsarConsumerPatternInTest.java | 2 +-
.../pulsar/PulsarCustomMessageReceiptTest.java | 6 +++---
.../camel/component/pulsar/PulsarEndpointTest.java | 8 ++++++--
.../pulsar/PulsarProducerHeadersInTest.java | 2 +-
.../component/pulsar/PulsarProducerInTest.java | 2 +-
.../PulsarProducerUndefinedProducerNameInTest.java | 2 +-
.../camel/component/pulsar/PulsarTestSupport.java | 23 ++++++++++++++++++++--
.../component/pulsar/utils/PulsarUtilsTest.java | 10 ++++++----
.../ConsumerCreationStrategyFactoryTest.java | 12 ++++++-----
.../utils/message/PulsarMessageUtilsTest.java | 4 ++--
20 files changed, 85 insertions(+), 43 deletions(-)
diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 876ed1c..4d1c20c 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -51,22 +51,22 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testcontainers</artifactId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
index 269b3b5..bb63488 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
@@ -18,11 +18,16 @@ package org.apache.camel.component.pulsar;
import org.apache.camel.component.pulsar.utils.AutoConfiguration;
import org.apache.camel.component.pulsar.utils.consumers.SubscriptionType;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,7 +37,7 @@ public class PulsarComponentTest extends CamelTestSupport {
private AutoConfiguration autoConfiguration;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
autoConfiguration = mock(AutoConfiguration.class);
super.setUp();
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentConsumerInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentConsumerInTest.java
index c859d30..8b9e685 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentConsumerInTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentConsumerInTest.java
@@ -32,7 +32,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -104,7 +104,9 @@ public class PulsarConcurrentConsumerInTest extends PulsarTestSupport {
producer.send("Hello World!");
}
+ System.out.println(NUMBER_OF_CONSUMERS + " messages sent, waiting for receival");
MockEndpoint.assertIsSatisfied(10, TimeUnit.SECONDS, to);
+ System.out.println("Messages received");
producer.close();
}
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentProducerInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentProducerInTest.java
index d3b4622..3c76a86 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentProducerInTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConcurrentProducerInTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.support.SimpleRegistry;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PulsarConcurrentProducerInTest extends PulsarTestSupport {
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
index d2548b0..3fbbba0 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
@@ -32,11 +32,13 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.body;
+
public class PulsarConsumerAcknowledgementTest extends PulsarTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(PulsarConsumerAcknowledgementTest.class);
@@ -53,7 +55,7 @@ public class PulsarConsumerAcknowledgementTest extends PulsarTestSupport {
private Producer<String> producer;
- @Before
+ @BeforeEach
public void setup() throws Exception {
context.removeRoute("myRoute");
producer = givenPulsarClient().newProducer(Schema.STRING).producerName(PRODUCER).topic(TOPIC_URI).create();
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java
index fc0ebdb..c970fb7 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java
@@ -30,8 +30,10 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
public class PulsarConsumerDeadLetterPolicyTest extends PulsarTestSupport {
@@ -66,7 +68,7 @@ public class PulsarConsumerDeadLetterPolicyTest extends PulsarTestSupport {
registry.bind("pulsar", comp);
}
- @Before
+ @BeforeEach
public void buildProducer() throws PulsarClientException {
try {
context.removeRoute("myRoute");
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInAsynchronousTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInAsynchronousTest.java
index 4f9b9ec..1f42c9c 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInAsynchronousTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInAsynchronousTest.java
@@ -34,10 +34,12 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.body;
+
public class PulsarConsumerInAsynchronousTest extends PulsarTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(PulsarConsumerInAsynchronousTest.class);
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInSynchronousTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInSynchronousTest.java
index 73cda55..a9b127d 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInSynchronousTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInSynchronousTest.java
@@ -34,10 +34,12 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.body;
+
public class PulsarConsumerInSynchronousTest extends PulsarTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(PulsarConsumerInAsynchronousTest.class);
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInTest.java
index 8ff9e91..ba217ec 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerInTest.java
@@ -32,7 +32,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
index 4769302..8b2f018 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
@@ -30,7 +30,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PulsarConsumerNoAcknowledgementTest extends PulsarTestSupport {
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerPatternInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerPatternInTest.java
index bbb4447..66b4a25 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerPatternInTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerPatternInTest.java
@@ -32,7 +32,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
index 3cdb832..e2e54a3 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
@@ -31,8 +31,8 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +63,7 @@ public class PulsarCustomMessageReceiptTest extends PulsarTestSupport {
private Producer<String> producer;
- @Before
+ @BeforeEach
public void setup() throws Exception {
producer = givenPulsarClient().newProducer(Schema.STRING).producerName(PRODUCER).topic(TOPIC_URI).create();
}
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java
index ea836de..ccae4d8b 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarEndpointTest.java
@@ -17,8 +17,12 @@
package org.apache.camel.component.pulsar;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class PulsarEndpointTest extends CamelTestSupport {
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerHeadersInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerHeadersInTest.java
index 299aa71..426a80d 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerHeadersInTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerHeadersInTest.java
@@ -33,7 +33,7 @@ import org.apache.camel.support.SimpleRegistry;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PulsarProducerHeadersInTest extends PulsarTestSupport {
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java
index 52b274e..bde0513 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.support.SimpleRegistry;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PulsarProducerInTest extends PulsarTestSupport {
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerUndefinedProducerNameInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerUndefinedProducerNameInTest.java
index c65d9ad..b038517 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerUndefinedProducerNameInTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerUndefinedProducerNameInTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.support.SimpleRegistry;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PulsarProducerUndefinedProducerNameInTest extends PulsarTestSupport {
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java
index bd9961f..4a525a6 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java
@@ -16,8 +16,13 @@
*/
package org.apache.camel.component.pulsar;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.Wait;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
+import org.junit.jupiter.api.TestInstance;
import org.testcontainers.containers.GenericContainer;
public class PulsarTestSupport extends ContainerAwareTestSupport {
@@ -46,4 +51,18 @@ public class PulsarTestSupport extends ContainerAwareTestSupport {
public String getPulsarAdminUrl() {
return String.format("http://%s:%s", getContainer(CONTAINER_NAME).getContainerIpAddress(), getContainer(CONTAINER_NAME).getMappedPort(BROKER_HTTP_PORT));
}
+
+ protected long containerShutdownTimeout() {
+ return TimeUnit.SECONDS.toSeconds(10);
+ }
+
+ protected void cleanupResources() throws Exception {
+ System.out.println("Cleaning up resources");
+ Instant t0 = Instant.now();
+ try {
+ super.cleanupResources();
+ } finally {
+ System.out.println("Resources clean up in " + Duration.between(t0, Instant.now()));
+ }
+ }
}
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/PulsarUtilsTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/PulsarUtilsTest.java
index f36f1e3..8e825f7 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/PulsarUtilsTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/PulsarUtilsTest.java
@@ -21,9 +21,10 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.PulsarClientException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -59,13 +60,14 @@ public class PulsarUtilsTest {
verify(consumer).close();
}
- @Test(expected = PulsarClientException.class)
+ @Test
public void givenConsumerThrowsPulsarClientExceptionwhenIStopConsumersverifyExceptionIsThrown() throws PulsarClientException {
Consumer<byte[]> consumer = mock(Consumer.class);
doThrow(new PulsarClientException("A Pulsar Client exception occurred")).when(consumer).close();
- consumer.close();
+ assertThrows(PulsarClientException.class,
+ () -> consumer.close());
verify(consumer).close();
}
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/consumers/ConsumerCreationStrategyFactoryTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/consumers/ConsumerCreationStrategyFactoryTest.java
index de45ca7..683ae8a 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/consumers/ConsumerCreationStrategyFactoryTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/consumers/ConsumerCreationStrategyFactoryTest.java
@@ -17,17 +17,19 @@
package org.apache.camel.component.pulsar.utils.consumers;
import org.apache.camel.component.pulsar.PulsarConsumer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
public class ConsumerCreationStrategyFactoryTest {
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void givenPulsarConsumerIsNullwhenICreateFactoryverifyIllegalArgumentExceptionIsThrown() {
- ConsumerCreationStrategyFactory.create(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> ConsumerCreationStrategyFactory.create(null));
}
@Test
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtilsTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtilsTest.java
index 0753d50..18deba9 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtilsTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/utils/message/PulsarMessageUtilsTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.pulsar.utils.message;
import java.io.Serializable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class PulsarMessageUtilsTest {
[camel] 35/43: [CAMEL-11807] Upgrade camel-spring-redis to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d3fc30bd11a67b3eed63c064cc32b3a09edb4e0c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 14:32:16 2020 +0200
[CAMEL-11807] Upgrade camel-spring-redis to junit5
---
.../java/org/apache/camel/component/redis/RedisConnectionTest.java | 2 --
.../test/java/org/apache/camel/component/redis/RedisConsumerTest.java | 2 --
.../src/test/java/org/apache/camel/component/redis/RedisGeoTest.java | 2 --
.../src/test/java/org/apache/camel/component/redis/RedisHashTest.java | 2 --
.../src/test/java/org/apache/camel/component/redis/RedisKeyTest.java | 2 --
.../src/test/java/org/apache/camel/component/redis/RedisListTest.java | 2 --
.../src/test/java/org/apache/camel/component/redis/RedisSetTest.java | 2 --
.../java/org/apache/camel/component/redis/RedisSortedSetTest.java | 2 --
.../test/java/org/apache/camel/component/redis/RedisStringTest.java | 2 --
.../test/java/org/apache/camel/component/redis/RedisTestSupport.java | 2 --
.../java/org/apache/camel/component/redis/RedisTransactionTest.java | 2 --
.../redis/processor/idempotent/RedisIdempotentRepositoryTest.java | 4 +---
.../processor/idempotent/RedisStringIdempotentRepositoryTest.java | 2 +-
13 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
index 5c86bff..88720ce 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
@@ -18,10 +18,8 @@ package org.apache.camel.component.redis;
import org.apache.camel.BindToRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
index c04bb33..51fb174 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
@@ -23,11 +23,9 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.connection.MessageListener;
import org.springframework.data.redis.listener.ChannelTopic;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java
index 4b466f8..516bcae 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java
@@ -19,9 +19,7 @@ package org.apache.camel.component.redis;
import org.apache.camel.BindToRegistry;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.geo.Circle;
import org.springframework.data.geo.Distance;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
index d11ff00..cf3b7c7 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
@@ -27,9 +27,7 @@ import java.util.Set;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
index a844676..26552a6 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
@@ -26,10 +26,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.connection.DataType;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
index 99c66a4..a30eea8 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
@@ -23,9 +23,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.ListOperations;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
index 30268ac..e2065aa 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
@@ -22,9 +22,7 @@ import java.util.Set;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.SetOperations;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
index 200c5e8..b92123e 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
@@ -22,9 +22,7 @@ import java.util.Set;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ZSetOperations;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
index 9e857ed..0a7f49f 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
@@ -25,10 +25,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.data.redis.core.RedisCallback;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
index 6108eff..64af992 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
@@ -23,9 +23,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java
index db20a8d..e8ceef0 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java
@@ -21,9 +21,7 @@ import java.util.List;
import org.apache.camel.BindToRegistry;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
index 4a0018d..92a77ae 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
@@ -18,9 +18,7 @@ package org.apache.camel.component.redis.processor.idempotent;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.data.redis.connection.RedisConnection;
@@ -28,7 +26,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.SetOperations;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
index 133a2b6..7b9ac1d 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
@@ -28,7 +28,7 @@ import org.springframework.data.redis.core.RedisOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
[camel] 17/43: [CAMEL-11807] Upgrade camel-spring-redis to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4fdaf75bf78ca22b5da9bec6d9a9e006dc5b4e2f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:48:38 2020 +0200
[CAMEL-11807] Upgrade camel-spring-redis to junit5
---
components/camel-spring-redis/pom.xml | 4 ++--
.../component/redis/RedisComponentSpringIntegrationTest.java | 10 ++++++----
.../apache/camel/component/redis/RedisConnectionTest.java | 6 ++++--
.../camel/component/redis/RedisConsumerIntegrationTest.java | 6 +++---
.../org/apache/camel/component/redis/RedisConsumerTest.java | 8 +++++---
.../java/org/apache/camel/component/redis/RedisGeoTest.java | 9 +++++----
.../java/org/apache/camel/component/redis/RedisHashTest.java | 6 ++++--
.../java/org/apache/camel/component/redis/RedisKeyTest.java | 6 ++++--
.../java/org/apache/camel/component/redis/RedisListTest.java | 6 ++++--
.../camel/component/redis/RedisProducerIntegrationTest.java | 8 +++++---
.../java/org/apache/camel/component/redis/RedisSetTest.java | 6 ++++--
.../org/apache/camel/component/redis/RedisSortedSetTest.java | 6 ++++--
.../org/apache/camel/component/redis/RedisStringTest.java | 7 +++++--
.../org/apache/camel/component/redis/RedisTestSupport.java | 5 +++--
.../apache/camel/component/redis/RedisTransactionTest.java | 5 +++--
.../processor/idempotent/RedisIdempotentRepositoryTest.java | 10 ++++++----
.../RedisStringIdempotentRepositoryIntegrationTest.java | 12 ++++++++----
.../idempotent/RedisStringIdempotentRepositoryTest.java | 11 +++++------
18 files changed, 80 insertions(+), 51 deletions(-)
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 2c02a17..92dba7e 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -53,12 +53,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java
index eefe708..90544aa 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java
@@ -21,12 +21,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-@Ignore ("IntegrationTest")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("IntegrationTest")
public class RedisComponentSpringIntegrationTest extends CamelSpringTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
index b3d6a90..5c86bff 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
@@ -17,18 +17,20 @@
package org.apache.camel.component.redis;
import org.apache.camel.BindToRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisConnectionTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
index 3f86f60..aeb7be0 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-@Ignore
+@Disabled
public class RedisConsumerIntegrationTest extends RedisTestSupport {
private static final JedisConnectionFactory CONNECTION_FACTORY = new JedisConnectionFactory();
private static final RedisMessageListenerContainer LISTENER_CONTAINER = new RedisMessageListenerContainer();
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
index 474fadc..c04bb33 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
@@ -21,22 +21,24 @@ import java.util.Iterator;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.connection.MessageListener;
import org.springframework.data.redis.listener.ChannelTopic;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.data.redis.listener.Topic;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisConsumerTest extends CamelTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java
index 7e6a9ac..4b466f8 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java
@@ -17,11 +17,12 @@
package org.apache.camel.component.redis;
import org.apache.camel.BindToRegistry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.geo.Circle;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Point;
@@ -34,7 +35,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisGeoTest extends RedisTestSupport {
@Mock
@@ -44,7 +45,7 @@ public class RedisGeoTest extends RedisTestSupport {
@Mock
private GeoOperations<String, String> geoOperations;
- @Before
+ @BeforeEach
public void setupTests() {
when(redisTemplate.opsForGeo()).thenReturn(geoOperations);
}
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
index 9716062..d11ff00 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
@@ -26,20 +26,22 @@ import java.util.Set;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisHashTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
index d620caa..a844676 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
@@ -25,15 +25,17 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.connection.DataType;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.query.SortQuery;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
@@ -41,7 +43,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisKeyTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
index c6dfc5f..99c66a4 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
@@ -22,20 +22,22 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.ListOperations;
import org.springframework.data.redis.core.RedisTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisListTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java
index 77974e7..7c3a5d0 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java
@@ -18,12 +18,14 @@ package org.apache.camel.component.redis;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
-@Ignore
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled
public class RedisProducerIntegrationTest extends RedisTestSupport {
private static final JedisConnectionFactory CONNECTION_FACTORY = new JedisConnectionFactory();
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
index b59c48c..30268ac 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
@@ -21,20 +21,22 @@ import java.util.Set;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.SetOperations;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisSetTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
index dcc95d5..200c5e8 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
@@ -21,13 +21,15 @@ import java.util.Set;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ZSetOperations;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyDouble;
import static org.mockito.ArgumentMatchers.anyLong;
@@ -35,7 +37,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisSortedSetTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
index 5be5e58..9e857ed 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
@@ -24,20 +24,23 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.ValueOperations;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RedisStringTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
index c59c945..6108eff 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java
@@ -22,13 +22,14 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisTestSupport extends CamelTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java
index 163da28..db20a8d 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java
@@ -20,15 +20,16 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.BindToRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.core.RedisTemplate;
import static org.mockito.Mockito.verify;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisTransactionTest extends RedisTestSupport {
@Mock
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
index b3c61f3..4a0018d 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.component.redis.processor.idempotent;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
@@ -30,7 +32,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RedisIdempotentRepositoryTest {
private static final String REPOSITORY = "testRepository";
@@ -47,7 +49,7 @@ public class RedisIdempotentRepositoryTest {
private RedisIdempotentRepository idempotentRepository;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
when(redisTemplate.opsForSet()).thenReturn(setOperations);
when(redisTemplate.getConnectionFactory()).thenReturn(redisConnectionFactory);
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java
index 8058256..41e4277 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java
@@ -26,13 +26,17 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
-@Ignore("requires online connection")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Disabled("requires online connection")
public class RedisStringIdempotentRepositoryIntegrationTest extends CamelTestSupport {
private static final JedisConnectionFactory CONNECTION_FACTORY = new JedisConnectionFactory();
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
index fd208bc..133a2b6 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
@@ -18,11 +18,10 @@ package org.apache.camel.component.redis.processor.idempotent;
import java.time.Duration;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisOperations;
@@ -33,7 +32,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class RedisStringIdempotentRepositoryTest {
private static final String REPOSITORY = "testRepository";
@@ -54,7 +53,7 @@ public class RedisStringIdempotentRepositoryTest {
private RedisStringIdempotentRepository idempotentRepository;
private RedisStringIdempotentRepository idempotentRepositoryNoExpiry;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
when(redisTemplate.opsForValue()).thenReturn(valueOperations);
idempotentRepository = new RedisStringIdempotentRepository(redisTemplate, REPOSITORY);
[camel] 06/43: [CAMEL-11807] Upgrade camel-yammer to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5a746d5815b395624d6ce68e2e357f8a6bf0ec5d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 11:21:05 2020 +0200
[CAMEL-11807] Upgrade camel-yammer to junit5
---
components/camel-yammer/pom.xml | 6 +++---
.../apache/camel/component/yammer/YammerComponentTestSupport.java | 2 +-
.../camel/component/yammer/YammerMessageAndUserRouteTest.java | 6 ++++--
.../camel/component/yammer/YammerMessageProducerRouteTest.java | 4 +++-
.../org/apache/camel/component/yammer/YammerMessageRouteTest.java | 4 +++-
.../camel/component/yammer/YammerMessagesConsumerOptionTest.java | 4 +++-
.../camel/component/yammer/YammerMultipleUsersRouteTest.java | 8 +++++---
.../camel/component/yammer/YammerUserPollEnrichRouteTest.java | 8 +++++---
.../org/apache/camel/component/yammer/YammerUserRouteTest.java | 4 +++-
9 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml
index e722fdf..1ab5aaf 100644
--- a/components/camel-yammer/pom.xml
+++ b/components/camel-yammer/pom.xml
@@ -68,14 +68,14 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
index 4d938b5..028e512 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.yammer;
import java.io.InputStream;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
public abstract class YammerComponentTestSupport extends CamelTestSupport {
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
index 8df242a..01e49a9 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.Messages;
import org.apache.camel.component.yammer.model.User;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class YammerMessageAndUserRouteTest extends CamelTestSupport {
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java
index bfdf379..e013ffb 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.Messages;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class YammerMessageProducerRouteTest extends YammerComponentTestSupport {
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java
index 3c546f7..15dce40 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.Messages;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class YammerMessageRouteTest extends YammerComponentTestSupport {
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
index 9d5ede9..354b968 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java
@@ -17,7 +17,9 @@
package org.apache.camel.component.yammer;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class YammerMessagesConsumerOptionTest extends YammerComponentTestSupport {
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
index fbd1a5d..69982d9 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.User;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Online access to yammer and fails with 401 authentication error")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("Online access to yammer and fails with 401 authentication error")
public class YammerMultipleUsersRouteTest extends YammerComponentTestSupport {
@SuppressWarnings("unchecked")
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
index 8b9addd..01916e8 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
@@ -20,10 +20,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.User;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Online access to yammer and fails with 401 authentication error")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("Online access to yammer and fails with 401 authentication error")
public class YammerUserPollEnrichRouteTest extends YammerComponentTestSupport {
@Test
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
index 48f0bc7..4cca226 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class YammerUserRouteTest extends YammerComponentTestSupport {
[camel] 21/43: [CAMEL-11807] Upgrade camel-beanstalk to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6af5fd7ddf1ffeb375017c5c3282198874e29a45
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:54:13 2020 +0200
[CAMEL-11807] Upgrade camel-beanstalk to junit5
---
components/camel-beanstalk/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-beanstalk/pom.xml b/components/camel-beanstalk/pom.xml
index 3863b1b..04d12ba 100644
--- a/components/camel-beanstalk/pom.xml
+++ b/components/camel-beanstalk/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 41/43: [CAMEL-11807] Upgrade camel-openstack to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a202b6e0a4176fcae15d44bf2a9916fbc555a555
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:14:00 2020 +0200
[CAMEL-11807] Upgrade camel-openstack to junit5
---
.../camel/component/openstack/cinder/VolumeProducerTest.java | 6 +++---
.../component/openstack/cinder/VolumeSnapshotProducerTest.java | 6 +++---
.../camel/component/openstack/glance/GlanceProducerTest.java | 6 +++---
.../camel/component/openstack/keystone/DomainProducerTest.java | 6 +++---
.../camel/component/openstack/keystone/GroupProducerTest.java | 6 +++---
.../camel/component/openstack/keystone/ProjectProducerTest.java | 6 +++---
.../camel/component/openstack/keystone/RegionProducerTest.java | 6 +++---
.../camel/component/openstack/keystone/UserProducerTest.java | 6 +++---
.../camel/component/openstack/neutron/NetworkProducerTest.java | 6 +++---
.../camel/component/openstack/neutron/PortProducerTest.java | 6 +++---
.../camel/component/openstack/neutron/RouterProducerTest.java | 6 +++---
.../camel/component/openstack/neutron/SubnetProducerTest.java | 6 +++---
.../apache/camel/component/openstack/nova/FlavorProducerTest.java | 8 ++++----
.../camel/component/openstack/nova/KeypairProducerTest.java | 4 ++--
.../apache/camel/component/openstack/nova/ServerProducerTest.java | 8 ++++----
.../camel/component/openstack/swift/ContainerProducerTest.java | 4 ++--
.../camel/component/openstack/swift/ObjectProducerTest.java | 2 +-
17 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
index 0bfe8ca..0580b6e 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
@@ -33,9 +33,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.storage.block.Volume;
import org.openstack4j.model.storage.block.builder.VolumeBuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
index 1b0dc11..68927d4 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
@@ -32,9 +32,9 @@ import org.openstack4j.api.storage.BlockVolumeSnapshotService;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.storage.block.VolumeSnapshot;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
index cc2aa59..f343641 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
@@ -38,9 +38,9 @@ import org.openstack4j.model.image.ContainerFormat;
import org.openstack4j.model.image.DiskFormat;
import org.openstack4j.model.image.Image;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isNull;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
index 4261d7f..6f2bb30 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
@@ -34,9 +34,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.identity.v3.Domain;
import org.openstack4j.model.network.Network;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
index fd33015..f57c1e0 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
@@ -34,9 +34,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.identity.v3.Group;
import org.openstack4j.model.network.Network;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
index 4c84521..a286e1a 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
@@ -34,9 +34,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.identity.v3.Project;
import org.openstack4j.model.network.Network;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
index e8d65c3..df91fcb 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
@@ -34,9 +34,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.identity.v3.Region;
import org.openstack4j.model.network.Network;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
index 856da1a..5f1b22d 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
@@ -34,9 +34,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.identity.v3.User;
import org.openstack4j.model.network.Network;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
index 78389bf..d11354e 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
@@ -35,9 +35,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.network.Network;
import org.openstack4j.model.network.NetworkType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
index 92efe72..e63d47a 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
@@ -34,9 +34,9 @@ import org.openstack4j.api.networking.PortService;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.network.Port;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
index e5ce385..3c19720 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
@@ -37,9 +37,9 @@ import org.openstack4j.model.network.Router;
import org.openstack4j.model.network.RouterInterface;
import org.openstack4j.openstack.networking.domain.NeutronRouterInterface;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
index 01415a3..bf136ee 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
@@ -35,9 +35,9 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.network.IPVersionType;
import org.openstack4j.model.network.Subnet;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
index 29e4cc1..09f7ca6 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
@@ -37,10 +37,10 @@ import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.compute.Flavor;
import org.openstack4j.model.compute.builder.FlavorBuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
index 851268e..8d867ba 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
@@ -32,8 +32,8 @@ import org.openstack4j.api.compute.KeypairService;
import org.openstack4j.model.compute.Keypair;
import org.openstack4j.openstack.compute.domain.NovaKeypair;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
index 012421d..43e8c8c 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
@@ -34,10 +34,10 @@ import org.openstack4j.model.compute.Action;
import org.openstack4j.model.compute.Server;
import org.openstack4j.model.compute.ServerCreate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
index 67e1fca..6bcaa32 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
@@ -36,8 +36,8 @@ import org.openstack4j.model.storage.object.SwiftContainer;
import org.openstack4j.model.storage.object.options.ContainerListOptions;
import org.openstack4j.model.storage.object.options.CreateUpdateContainerOptions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isNull;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
index 7708143..835b12b 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
@@ -40,7 +40,7 @@ import org.openstack4j.model.common.Payloads;
import org.openstack4j.model.storage.object.SwiftObject;
import org.openstack4j.model.storage.object.options.ObjectLocation;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
[camel] 12/43: [CAMEL-11807] Upgrade camel-zipkin to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit eedcf3b0d1255f7de38a3fc7c691d540294d1d41
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:23:11 2020 +0200
[CAMEL-11807] Upgrade camel-zipkin to junit5
---
components/camel-zipkin/pom.xml | 7 ++++++-
.../test/java/org/apache/camel/zipkin/CamelRequestTest.java | 2 +-
.../org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java | 11 ++++++++---
.../org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java | 6 ++++--
.../test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java | 6 ++++--
.../org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java | 4 ++--
.../camel/zipkin/ZipkinClientRecipientListRouteTest.java | 6 ++++--
.../org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java | 6 ++++--
.../apache/camel/zipkin/ZipkinMultiServerNoClientTest.java | 4 ++--
.../org/apache/camel/zipkin/ZipkinMulticastRouteTest.java | 6 ++++--
.../org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java | 4 ++--
.../test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java | 4 ++--
.../org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java | 4 ++--
.../org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java | 6 ++++--
.../org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java | 6 ++++--
.../org/apache/camel/zipkin/ZipkinServerMulticastTest.java | 4 ++--
.../apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java | 6 ++++--
.../apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java | 6 ++++--
.../java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java | 6 ++++--
.../apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java | 7 +++++--
.../java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java | 6 ++++--
.../test/java/org/apache/camel/zipkin/ZipkinTracerTest.java | 4 ++--
.../test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java | 4 ++--
.../org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java | 4 ++--
.../apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java | 4 ++--
25 files changed, 84 insertions(+), 49 deletions(-)
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 6c202ba..ac3bf30e 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -75,7 +75,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -93,6 +93,11 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java
index 75cccff..06464ee 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.zipkin;
import brave.Span;
import org.apache.camel.Message;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java
index 5d69c9f..c1db957 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java
@@ -25,10 +25,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.apache.camel.test.junit5.TestSupport.isPlatform;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ManagedZipkinSimpleRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
@@ -73,7 +78,7 @@ public class ManagedZipkinSimpleRouteTest extends CamelTestSupport {
assertTrue(mbeanServer.isRegistered(on));
Float rate = (Float) mbeanServer.getAttribute(on, "Rate");
- assertEquals("Should be 1.0f", 1.0f, rate.floatValue(), 0.1f);
+ assertEquals(1.0f, rate.floatValue(), 0.1f, "Should be 1.0f");
NotifyBuilder notify = new NotifyBuilder(context).whenDone(5).create();
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java
index 506b28c..182d16e 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.zipkin;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SpringZipkinSimpleRouteTest extends CamelSpringTestSupport {
@Override
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java
index 956e54c..15109ca 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinABCRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java
index 793c22e..fa4a690 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java
@@ -24,8 +24,8 @@ 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.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
public class ZipkinClientCustomTagsTest extends CamelTestSupport {
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java
index c0d2437..bb2eb2d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinClientRecipientListRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java
index 5102b41..6a71f90 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java
@@ -21,11 +21,13 @@ 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.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.MDC;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ZipkinMDCScopeDecoratorTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java
index 5696d0a..9158750 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.zipkin;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
public class ZipkinMultiServerNoClientTest extends CamelTestSupport {
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java
index 391b3ad..0f092a8 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinMulticastRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java
index 3299821..90755be 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.zipkin;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
public class ZipkinOneRouteFallbackTest extends CamelTestSupport {
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java
index ae0149c..36aabe4 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.zipkin;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
public class ZipkinOneRouteTest extends CamelTestSupport {
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java
index 2b7cc78..b4e28c4 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java
@@ -23,9 +23,9 @@ 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.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
public class ZipkinProducerSpanKindTest extends CamelTestSupport {
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java
index b342e89..2ed190c 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinRecipientListRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
index 149c401..aab6d3d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinRouteConcurrentTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java
index 9a32b74..5fd73ce 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.zipkin;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
public class ZipkinServerMulticastTest extends CamelTestSupport {
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java
index 3945155..45ef7b7 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinSimpleFallbackRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java
index 903606b..5b1689b 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinSimpleLogStreamsRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
index 83eb155..c241f2d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinSimpleRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
index f1c0d0b..2a55812 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
@@ -19,10 +19,13 @@ package org.apache.camel.zipkin;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinSpanReporterInRegistryTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java
index c152fcd..d92a37e 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java
@@ -23,10 +23,12 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZipkinTimerRouteTest extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java
index 55f9a34..014a946 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.zipkin;
import brave.Span;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
import static org.mockito.Mockito.mock;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
index d724a30..74eae4d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.zipkin;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import zipkin2.reporter.Reporter;
public class ZipkinTwoRouteTest extends CamelTestSupport {
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java
index f6b037c..c9465c7 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java
@@ -19,9 +19,9 @@ package org.apache.camel.zipkin.http;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.zipkin.ZipkinTracer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test requires running Zipkin running
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
index b38c7e2..ae37cdb 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
@@ -19,9 +19,9 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.zipkin.ZipkinTracer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test requires running Zipkin/Scribe running
[camel] 20/43: [CAMEL-11807] Upgrade camel-azure-storage-queue to
junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9547f884fb1ad4878efcbb84756c8bbf543019f1
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:53:11 2020 +0200
[CAMEL-11807] Upgrade camel-azure-storage-queue to junit5
---
components/camel-azure-storage-queue/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-azure-storage-queue/pom.xml b/components/camel-azure-storage-queue/pom.xml
index 9c3b1f4..e54c907 100644
--- a/components/camel-azure-storage-queue/pom.xml
+++ b/components/camel-azure-storage-queue/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 26/43: [CAMEL-11807] Upgrade camel-cxf to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b7301463af154eb1a59b5f0fccaf9978d1aca26
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:01:31 2020 +0200
[CAMEL-11807] Upgrade camel-cxf to junit5
---
components/camel-cxf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index bd694c1..35c5b97 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -277,7 +277,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 08/43: [CAMEL-11807] Upgrade camel-zipfile to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 153f25160e0a6a31e2c107ea4c42a245cc1188cf
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 11:35:49 2020 +0200
[CAMEL-11807] Upgrade camel-zipfile to junit5
---
components/camel-zipfile/pom.xml | 4 +--
.../zipfile/SpringZipSplitterRouteTest.java | 4 +--
.../dataformat/zipfile/ZipFileDataFormatTest.java | 33 ++++++++++++----------
.../zipfile/ZipFileIteratorDataFormatTest.java | 4 +--
.../zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../zipfile/ZipFileSplitAndDeleteTest.java | 15 ++++++----
.../zipfile/ZipFileSplitOneFileTest.java | 10 ++++---
.../zipfile/ZipSplitterRouteIssueTest.java | 10 ++++---
.../dataformat/zipfile/ZipSplitterRouteTest.java | 4 +--
.../AggregationStrategyWithFilenameHeaderTest.java | 17 ++++++-----
.../AggregationStrategyWithPreservationTest.java | 22 +++++++++------
.../ZipAggregationStrategyEmptyFileTest.java | 16 +++++++----
.../zipfile/ZipAggregationStrategyTest.java | 16 +++++++----
13 files changed, 91 insertions(+), 66 deletions(-)
diff --git a/components/camel-zipfile/pom.xml b/components/camel-zipfile/pom.xml
index 2e59308..977a91e 100644
--- a/components/camel-zipfile/pom.xml
+++ b/components/camel-zipfile/pom.xml
@@ -47,7 +47,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java
index ddb746a..f5d3974 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.dataformat.zipfile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringZipSplitterRouteTest extends CamelSpringTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
index 31115a0..f2817fa 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
@@ -39,10 +39,14 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.stream.InputStreamCache;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.*;
import static org.apache.camel.Exchange.FILE_NAME;
@@ -157,13 +161,12 @@ public class ZipFileDataFormatTest extends CamelTestSupport {
deleteDirectory(new File("hello_out"));
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testUnzipWithCorruptedZipFile() throws Exception {
deleteDirectory(new File("hello_out"));
- template.sendBody("direct:corruptUnzip", new File("src/test/resources/corrupt.zip"));
-
- deleteDirectory(new File("hello_out"));
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:corruptUnzip", new File("src/test/resources/corrupt.zip")));
}
@Test
@@ -195,12 +198,12 @@ public class ZipFileDataFormatTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
// use builder to ensure the exchange is fully done before we check for file exists
- assertTrue("The exchange is not done in time.", notify.matches(5, TimeUnit.SECONDS));
+ assertTrue(notify.matches(5, TimeUnit.SECONDS), "The exchange is not done in time.");
Exchange exchange = mock.getReceivedExchanges().get(0);
File file = new File(TEST_DIR, exchange.getIn().getMessageId() + ".zip");
- assertTrue("The file should exist.", file.exists());
- assertArrayEquals("Get a wrong message content.", getZippedText(exchange.getIn().getMessageId()), getBytes(file));
+ assertTrue(file.exists(), "The file should exist.");
+ assertArrayEquals(getZippedText(exchange.getIn().getMessageId()), getBytes(file), "Get a wrong message content.");
}
@Test
@@ -211,7 +214,7 @@ public class ZipFileDataFormatTest extends CamelTestSupport {
mock.expectedMessageCount(1);
File file = new File(TEST_DIR, "poem.txt.zip");
- assertFalse("The zip should not exit.", file.exists());
+ assertFalse(file.exists(), "The zip should not exit.");
template.sendBodyAndHeader("direct:zipToFile", TEXT, FILE_NAME, "poem.txt");
@@ -219,10 +222,10 @@ public class ZipFileDataFormatTest extends CamelTestSupport {
mock.assertIsSatisfied();
// use builder to ensure the exchange is fully done before we check for file exists
- assertTrue("The exchange is not done in time.", notify.matches(5, TimeUnit.SECONDS));
+ assertTrue(notify.matches(5, TimeUnit.SECONDS), "The exchange is not done in time.");
- assertTrue("The file should exist.", file.exists());
- assertArrayEquals("Get a wrong message content.", getZippedText("poem.txt"), getBytes(file));
+ assertTrue(file.exists(), "The file should exist.");
+ assertArrayEquals(getZippedText("poem.txt"), getBytes(file), "Get a wrong message content.");
}
@Test
@@ -246,7 +249,7 @@ public class ZipFileDataFormatTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
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 f576429..8f75453 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
@@ -22,8 +22,8 @@ import java.util.stream.Stream;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*;
public class ZipFileIteratorDataFormatTest extends CamelTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
index fe3cf94..2120667 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
@@ -22,7 +22,7 @@ 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.Test;
+import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*;
public class ZipFileMultipleFilesSplitterTest extends ZipSplitterRouteTest {
static final String PROCESSED_FILES_HEADER_NAME = "processedFiles";
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java
index 27691de..62e601e 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java
@@ -27,15 +27,18 @@ import java.util.Iterator;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class ZipFileSplitAndDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/testDeleteZipFileWhenUnmarshalWithDataFormat");
deleteDirectory("target/testDeleteZipFileWhenUnmarshalWithSplitter");
@@ -53,7 +56,7 @@ public class ZipFileSplitAndDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
// the original file should have been deleted
- assertFalse("File should been deleted", new File(zipFile).exists());
+ assertFalse(new File(zipFile).exists(), "File should been deleted");
}
@Test
@@ -67,7 +70,7 @@ public class ZipFileSplitAndDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
// the original file should have been deleted,
- assertFalse("File should been deleted", new File(zipFile).exists());
+ assertFalse(new File(zipFile).exists(), "File should been deleted");
}
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
index a0d77d8..6aabea2 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
@@ -28,14 +28,16 @@ import java.util.zip.ZipOutputStream;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class ZipFileSplitOneFileTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/zip-unmarshal");
super.setUp();
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java
index d00ab5d..5de29ae 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java
@@ -19,14 +19,16 @@ package org.apache.camel.dataformat.zipfile;
import java.io.File;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class ZipSplitterRouteIssueTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/zip");
super.setUp();
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
index 571eda4..2f30f4b2 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.dataformat.zipfile;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*;
public class ZipSplitterRouteTest extends CamelTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java
index ea1c703..f52dacc 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java
@@ -26,10 +26,13 @@ import java.util.zip.ZipFile;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.*;
public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport {
@@ -37,7 +40,7 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
private static final String TEST_DIR = "target/out_AggregationStrategyWithFilenameHeaderTest";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
@@ -55,7 +58,7 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
File[] files = new File(TEST_DIR).listFiles();
assertNotNull(files);
- assertTrue("Should be a file in " + TEST_DIR + " directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in " + TEST_DIR + " directory");
File resultFile = files[0];
@@ -66,9 +69,9 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
while (entries.hasMoreElements()) {
fileCount++;
final ZipEntry entry = entries.nextElement();
- assertTrue("Zip entry file name should be on of: " + FILE_NAMES, FILE_NAMES.contains(entry.getName()));
+ assertTrue(FILE_NAMES.contains(entry.getName()), "Zip entry file name should be on of: " + FILE_NAMES);
}
- assertEquals("Zip file should contain " + FILE_NAMES.size() + " files", FILE_NAMES.size(), fileCount);
+ assertEquals(FILE_NAMES.size(), fileCount, "Zip file should contain " + FILE_NAMES.size() + " files");
} finally {
IOHelper.close(file);
}
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
index 66ebc8a..b8e1b54 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
@@ -26,10 +26,13 @@ import java.util.zip.ZipInputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.*;
public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
@@ -37,7 +40,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
private static final String TEST_DIR = "target/out_AggregationStrategyWithPreservationTest";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
@@ -51,7 +54,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
File[] files = new File(TEST_DIR).listFiles();
assertNotNull(files);
- assertTrue("Should be a file in " + TEST_DIR + " directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in " + TEST_DIR + " directory");
File resultFile = files[0];
Set<String> expectedZipFiles = new HashSet<>(Arrays.asList("another/hello.txt",
@@ -62,14 +65,15 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
int fileCount = 0;
for (ZipEntry ze = zin.getNextEntry(); ze != null; ze = zin.getNextEntry()) {
if (!ze.isDirectory()) {
- assertTrue("Found unexpected entry " + ze + " in zipfile", expectedZipFiles.remove(ze.toString()));
+ assertTrue(expectedZipFiles.remove(ze.toString()), "Found unexpected entry " + ze + " in zipfile");
fileCount++;
}
}
- assertTrue(String.format("Zip file should contains %d files, got %d files", AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES, fileCount),
- fileCount == AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES);
- assertEquals("Should have found all of the zip files in the file. Remaining: " + expectedZipFiles, 0, expectedZipFiles.size());
+ assertEquals(fileCount, AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES,
+ String.format("Zip file should contains %d files, got %d files", AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES, fileCount));
+ assertEquals(0, expectedZipFiles.size(),
+ "Should have found all of the zip files in the file. Remaining: " + expectedZipFiles);
} finally {
IOHelper.close(zin);
}
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java
index 5bb7b2d..47b5e18 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java
@@ -23,10 +23,13 @@ import java.util.zip.ZipInputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.*;
public class ZipAggregationStrategyEmptyFileTest extends CamelTestSupport {
@@ -35,7 +38,7 @@ public class ZipAggregationStrategyEmptyFileTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/foo");
deleteDirectory(TEST_DIR);
@@ -57,7 +60,7 @@ public class ZipAggregationStrategyEmptyFileTest extends CamelTestSupport {
File[] files = new File(TEST_DIR).listFiles();
assertNotNull(files);
- assertTrue("Should be a file in " + TEST_DIR + " directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in " + TEST_DIR + " directory");
File resultFile = files[0];
@@ -67,7 +70,8 @@ public class ZipAggregationStrategyEmptyFileTest extends CamelTestSupport {
for (ZipEntry ze = zin.getNextEntry(); ze != null; ze = zin.getNextEntry()) {
fileCount++;
}
- assertEquals("Zip file should contains " + ZipAggregationStrategyEmptyFileTest.EXPECTED_NO_FILES + " files", ZipAggregationStrategyEmptyFileTest.EXPECTED_NO_FILES, fileCount);
+ assertEquals(ZipAggregationStrategyEmptyFileTest.EXPECTED_NO_FILES, fileCount,
+ "Zip file should contains " + ZipAggregationStrategyEmptyFileTest.EXPECTED_NO_FILES + " files");
} finally {
IOHelper.close(zin);
}
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
index a06d989..60fdbcc 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
@@ -23,10 +23,13 @@ import java.util.zip.ZipInputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.*;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.*;
public class ZipAggregationStrategyTest extends CamelTestSupport {
@@ -34,7 +37,7 @@ public class ZipAggregationStrategyTest extends CamelTestSupport {
private static final String TEST_DIR = "target/out_ZipAggregationStrategyTest";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
@@ -50,7 +53,7 @@ public class ZipAggregationStrategyTest extends CamelTestSupport {
File[] files = new File(TEST_DIR).listFiles();
assertNotNull(files);
- assertTrue("Should be a file in " + TEST_DIR + " directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in " + TEST_DIR + " directory");
File resultFile = files[0];
@@ -60,7 +63,8 @@ public class ZipAggregationStrategyTest extends CamelTestSupport {
for (ZipEntry ze = zin.getNextEntry(); ze != null; ze = zin.getNextEntry()) {
fileCount++;
}
- assertEquals("Zip file should contains " + ZipAggregationStrategyTest.EXPECTED_NO_FILES + " files", ZipAggregationStrategyTest.EXPECTED_NO_FILES, fileCount);
+ assertEquals(ZipAggregationStrategyTest.EXPECTED_NO_FILES, fileCount,
+ "Zip file should contains " + ZipAggregationStrategyTest.EXPECTED_NO_FILES + " files");
} finally {
IOHelper.close(zin);
}
[camel] 13/43: [CAMEL-11807] Upgrade camel-openstack to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e061d3e0fa059f9023f19433af4ec6fde4a4ba2c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:40:49 2020 +0200
[CAMEL-11807] Upgrade camel-openstack to junit5
---
components/camel-openstack/pom.xml | 6 +++---
.../component/openstack/AbstractProducerTestSupport.java | 10 +++++-----
.../openstack/cinder/CinderProducerTestSupport.java | 10 +++++-----
.../camel/component/openstack/cinder/VolumeProducerTest.java | 12 ++++++------
.../openstack/cinder/VolumeSnapshotProducerTest.java | 12 ++++++------
.../camel/component/openstack/glance/GlanceProducerTest.java | 12 ++++++------
.../component/openstack/keystone/DomainProducerTest.java | 12 ++++++------
.../component/openstack/keystone/GroupProducerTest.java | 12 ++++++------
.../openstack/keystone/KeystoneProducerTestSupport.java | 10 +++++-----
.../component/openstack/keystone/ProjectProducerTest.java | 12 ++++++------
.../component/openstack/keystone/RegionProducerTest.java | 12 ++++++------
.../camel/component/openstack/keystone/UserProducerTest.java | 12 ++++++------
.../component/openstack/neutron/NetworkProducerTest.java | 12 ++++++------
.../openstack/neutron/NeutronProducerTestSupport.java | 10 +++++-----
.../camel/component/openstack/neutron/PortProducerTest.java | 12 ++++++------
.../component/openstack/neutron/RouterProducerTest.java | 12 ++++++------
.../component/openstack/neutron/SubnetProducerTest.java | 12 ++++++------
.../camel/component/openstack/nova/FlavorProducerTest.java | 12 ++++++------
.../camel/component/openstack/nova/KeypairProducerTest.java | 12 ++++++------
.../component/openstack/nova/NovaProducerTestSupport.java | 10 +++++-----
.../camel/component/openstack/nova/ServerProducerTest.java | 12 ++++++------
.../component/openstack/swift/ContainerProducerTest.java | 12 ++++++------
.../camel/component/openstack/swift/ObjectProducerTest.java | 12 ++++++------
.../component/openstack/swift/SwiftProducerTestSupport.java | 10 +++++-----
24 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index 0e8a909..33b1937 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -55,13 +55,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
index 78a1b1e..b14dc8b 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
@@ -24,15 +24,15 @@ import org.apache.camel.Message;
import org.apache.camel.Producer;
import org.apache.camel.impl.engine.DefaultHeadersMapFactory;
import org.apache.camel.support.DefaultMessage;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.OSClient.OSClientV3;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public abstract class AbstractProducerTestSupport {
@Mock
@@ -48,7 +48,7 @@ public abstract class AbstractProducerTestSupport {
protected Producer producer;
- @Before
+ @BeforeEach
public void before() throws IOException {
msg = new DefaultMessage(camelContext);
when(exchange.getIn()).thenReturn(msg);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
index 9de4e65..f302cce 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.cinder;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.BlockStorageService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class CinderProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class CinderProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected BlockStorageService blockStorageService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.blockStorage()).thenReturn(blockStorageService);
}
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
index 6b26652..0bfe8ca 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
@@ -20,13 +20,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.cinder.producer.VolumeProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.storage.BlockVolumeService;
import org.openstack4j.model.common.ActionResponse;
@@ -41,7 +41,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class VolumeProducerTest extends CinderProducerTestSupport {
@Mock
@@ -64,7 +64,7 @@ public class VolumeProducerTest extends CinderProducerTestSupport {
private Volume dummyVolume;
- @Before
+ @BeforeEach
public void setUp() {
when(blockStorageService.volumes()).thenReturn(volumeService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
index d099400..1b0dc11 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
@@ -20,13 +20,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.cinder.producer.SnapshotProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.storage.BlockVolumeSnapshotService;
import org.openstack4j.model.common.ActionResponse;
@@ -40,7 +40,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
@Mock
@@ -63,7 +63,7 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
private VolumeSnapshot dummyVolumeSnapshot;
- @Before
+ @BeforeEach
public void setUp() {
when(blockStorageService.snapshots()).thenReturn(snapshotService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
index 09b2543..cc2aa59 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
@@ -23,14 +23,14 @@ import java.util.UUID;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.image.ImageService;
import org.openstack4j.model.common.Payload;
@@ -47,7 +47,7 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class GlanceProducerTest extends AbstractProducerTestSupport {
@Mock
@@ -73,7 +73,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
@Spy
private Image osImage = Builders.image().build();
- @Before
+ @BeforeEach
public void setUp() {
producer = new GlanceProducer(endpoint, client);
when(client.images()).thenReturn(imageService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
index a1ab71b..4261d7f 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.DomainProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.DomainService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class DomainProducerTest extends KeystoneProducerTestSupport {
private Domain dummyDomain;
@@ -60,7 +60,7 @@ public class DomainProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> domainIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.domains()).thenReturn(domainService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
index 89bc885..fd33015 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.GroupProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.GroupService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class GroupProducerTest extends KeystoneProducerTestSupport {
private Group dummyGroup;
@@ -60,7 +60,7 @@ public class GroupProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> groupIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.groups()).thenReturn(groupService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java
index 731a278..e10d095 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.keystone;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.identity.v3.IdentityService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class KeystoneProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class KeystoneProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected IdentityService identityService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.identity()).thenReturn(identityService);
}
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
index 9577915..4c84521 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.ProjectProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.ProjectService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ProjectProducerTest extends KeystoneProducerTestSupport {
private Project dummyProject;
@@ -60,7 +60,7 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> projectIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.projects()).thenReturn(projectService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
index 2874d2a..e8d65c3 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.RegionProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.RegionService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RegionProducerTest extends KeystoneProducerTestSupport {
private Region dummyRegion;
@@ -60,7 +60,7 @@ public class RegionProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> regionIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.regions()).thenReturn(regionService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
index 73299c7..856da1a 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.UserProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.UserService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class UserProducerTest extends KeystoneProducerTestSupport {
private User dummyUser;
@@ -60,7 +60,7 @@ public class UserProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> userIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.users()).thenReturn(userService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
index 6501467..78389bf 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.NetworkProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.NetworkService;
import org.openstack4j.model.common.ActionResponse;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class NetworkProducerTest extends NeutronProducerTestSupport {
private Network dummyNetwork;
@@ -61,7 +61,7 @@ public class NetworkProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<String> networkIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.network()).thenReturn(networkService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java
index a4bb766..2387cab 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.neutron;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.networking.NetworkingService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class NeutronProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class NeutronProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected NetworkingService networkingService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.networking()).thenReturn(networkingService);
}
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
index 0075acc..92efe72 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.PortProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.PortService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class PortProducerTest extends NeutronProducerTestSupport {
private Port dummyPort;
@@ -60,7 +60,7 @@ public class PortProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<String> portIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.port()).thenReturn(portService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
index 0767267..e5ce385 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.RouterProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.RouterService;
import org.openstack4j.model.common.ActionResponse;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RouterProducerTest extends NeutronProducerTestSupport {
private Router dummyRouter;
@@ -72,7 +72,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<AttachInterfaceType> itfTypeCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.router()).thenReturn(routerService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
index 3e9601b..01415a3 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.SubnetProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.SubnetService;
import org.openstack4j.model.common.ActionResponse;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class SubnetProducerTest extends NeutronProducerTestSupport {
private Subnet dummySubnet;
@@ -61,7 +61,7 @@ public class SubnetProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<String> subnetIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.subnet()).thenReturn(subnetService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
index f261b1b..29e4cc1 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
@@ -24,13 +24,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.producer.FlavorsProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.compute.FlavorService;
import org.openstack4j.model.common.ActionResponse;
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class FlavorProducerTest extends NovaProducerTestSupport {
@Mock
@@ -64,7 +64,7 @@ public class FlavorProducerTest extends NovaProducerTestSupport {
private Flavor dummyFlavor;
- @Before
+ @BeforeEach
public void setUp() {
when(computeService.flavors()).thenReturn(flavorService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
index 2fada71..851268e 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.producer.KeypairProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.compute.KeypairService;
import org.openstack4j.model.compute.Keypair;
import org.openstack4j.openstack.compute.domain.NovaKeypair;
@@ -39,7 +39,7 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class KeypairProducerTest extends NovaProducerTestSupport {
private static final String KEYPAIR_NAME = "keypairName";
@@ -57,7 +57,7 @@ public class KeypairProducerTest extends NovaProducerTestSupport {
@Captor
private ArgumentCaptor<String> keypairCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(computeService.keypairs()).thenReturn(keypairService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java
index f719236..766d0a9 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.nova;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.compute.ComputeService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class NovaProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class NovaProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected ComputeService computeService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.compute()).thenReturn(computeService);
}
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
index ab27c1a..012421d 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
@@ -20,13 +20,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.producer.ServerProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.compute.ServerService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ServerProducerTest extends NovaProducerTestSupport {
@Mock(lenient = true)
@@ -66,7 +66,7 @@ public class ServerProducerTest extends NovaProducerTestSupport {
private ServerCreate dummyServer;
- @Before
+ @BeforeEach
public void setUp() {
when(computeService.servers()).thenReturn(serverService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
index 6717c09..67e1fca 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
@@ -23,13 +23,13 @@ import java.util.Map;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.swift.producer.ContainerProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.ObjectStorageContainerService;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.storage.object.SwiftContainer;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ContainerProducerTest extends SwiftProducerTestSupport {
private static final String CONTAINER_NAME = "containerName";
@@ -71,7 +71,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport {
@Captor
private ArgumentCaptor<ContainerListOptions> containerListOptionsCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(objectStorageService.containers()).thenReturn(containerService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
index cf6929a..7708143 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
@@ -26,13 +26,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.swift.producer.ObjectProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.ObjectStorageObjectService;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.common.Payload;
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ObjectProducerTest extends SwiftProducerTestSupport {
private static final String CONTAINER_NAME = "containerName";
@@ -75,7 +75,7 @@ public class ObjectProducerTest extends SwiftProducerTestSupport {
@Captor
private ArgumentCaptor<Map<String, String>> dataCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(objectStorageService.objects()).thenReturn(objectService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java
index 2954d34..6d4a11d 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.swift;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.ObjectStorageService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class SwiftProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class SwiftProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected ObjectStorageService objectStorageService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.objectStorage()).thenReturn(objectStorageService);
}
[camel] 37/43: [CAMEL-11807] Upgrade camel-catalog to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9c2681ec0fd5b0e92b468cbd503bdc809b96ed21
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:08:21 2020 +0200
[CAMEL-11807] Upgrade camel-catalog to junit5
---
catalog/camel-catalog-lucene/pom.xml | 4 +--
.../catalog/lucene/CamelCatalogLuceneTest.java | 12 ++++----
catalog/camel-catalog-maven/pom.xml | 4 +--
.../catalog/maven/MavenArtifactProviderTest.java | 14 +++++----
.../catalog/maven/MavenVersionManagerTest.java | 15 ++++++----
catalog/camel-catalog/pom.xml | 4 +--
.../apache/camel/catalog/components/aws-sns.json | 2 --
.../apache/camel/catalog/components/aws-sqs.json | 2 --
.../apache/camel/catalog/components/aws2-sns.json | 2 --
.../apache/camel/catalog/components/aws2-sqs.json | 2 --
.../camel/catalog/CamelCatalogCacheTest.java | 4 +--
.../camel/catalog/CamelCatalogJsonSchemaTest.java | 34 ++++++++++++----------
.../org/apache/camel/catalog/CamelCatalogTest.java | 16 +++++-----
13 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/catalog/camel-catalog-lucene/pom.xml b/catalog/camel-catalog-lucene/pom.xml
index 48df092..770bd30 100644
--- a/catalog/camel-catalog-lucene/pom.xml
+++ b/catalog/camel-catalog-lucene/pom.xml
@@ -69,8 +69,8 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java b/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java
index 2b5681d..84d0054 100644
--- a/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java
+++ b/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java
@@ -19,18 +19,18 @@ package org.apache.camel.catalog.lucene;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.catalog.EndpointValidationResult;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelCatalogLuceneTest {
private CamelCatalog catalog;
- @Before
+ @BeforeAll
public void createCamelCatalog() {
catalog = new DefaultCamelCatalog();
catalog.setSuggestionStrategy(new LuceneSuggestionStrategy());
diff --git a/catalog/camel-catalog-maven/pom.xml b/catalog/camel-catalog-maven/pom.xml
index d888682..db2ef2d 100644
--- a/catalog/camel-catalog-maven/pom.xml
+++ b/catalog/camel-catalog-maven/pom.xml
@@ -78,8 +78,8 @@
<!-- testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java
index 2e4026b..423c052 100644
--- a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java
+++ b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java
@@ -20,12 +20,14 @@ import java.util.Set;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Cannot run on CI servers so run manually")
-public class MavenArtifactProviderTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Disabled("Cannot run on CI servers so run manually")
+public class MavenArtifactProviderTest {
@Test
public void testAddComponent() {
@@ -40,7 +42,7 @@ public class MavenArtifactProviderTest extends Assert {
int after = camelCatalog.findComponentNames().size();
- assertTrue("Should find 1 new component", after - before == 1);
+ assertEquals(1, after - before, "Should find 1 new component");
}
}
diff --git a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
index 36f1cc9..d81bad6 100644
--- a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
+++ b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
@@ -23,12 +23,17 @@ import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.catalog.DefaultRuntimeProvider;
import org.apache.camel.catalog.impl.CatalogHelper;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Cannot run on CI servers so run manually")
-public class MavenVersionManagerTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Disabled("Cannot run on CI servers so run manually")
+public class MavenVersionManagerTest {
private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/components.properties";
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index 1f5ee74..f0c498a 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -99,8 +99,8 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sns.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sns.json
index 8c6e65d..ee5b5ae 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sns.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sns.json
@@ -24,7 +24,6 @@
"amazonSNSClient": { "kind": "property", "displayName": "Amazon SNSClient", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.services.sns.AmazonSNS", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "To use the AmazonSNS as the client" },
"amazonSQSClient": { "kind": "property", "displayName": "Amazon SQSClient", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.services.sqs.AmazonSQS", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "An SQS Client to use as bridge between SNS and SQS" },
"autoCreateTopic": { "kind": "property", "displayName": "Auto Create Topic", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the topic" },
- "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry [...]
"configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.sns.SnsConfiguration", "deprecated": false, "secret": false, "description": "The component configuration" },
"kmsMasterKeyId": { "kind": "property", "displayName": "Kms Master Key Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK." },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
@@ -47,7 +46,6 @@
"amazonSNSClient": { "kind": "parameter", "displayName": "Amazon SNSClient", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.services.sns.AmazonSNS", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "To use the AmazonSNS as the client" },
"amazonSQSClient": { "kind": "parameter", "displayName": "Amazon SQSClient", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.services.sqs.AmazonSQS", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "An SQS Client to use as bridge between SNS and SQS" },
"autoCreateTopic": { "kind": "parameter", "displayName": "Auto Create Topic", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the topic" },
- "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registr [...]
"headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel." },
"kmsMasterKeyId": { "kind": "parameter", "displayName": "Kms Master Key Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sns.SnsConfiguration", "configurationField": "configuration", "description": "The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sqs.json
index 49b4ba1..f7b33d9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sqs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-sqs.json
@@ -24,7 +24,6 @@
"amazonAWSHost": { "kind": "property", "displayName": "Amazon AWSHost", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "amazonaws.com", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The hostname of the Amazon AWS cloud." },
"amazonSQSClient": { "kind": "property", "displayName": "Amazon SQSClient", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.services.sqs.AmazonSQS", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To use the AmazonSQS as client" },
"autoCreateQueue": { "kind": "property", "displayName": "Auto Create Queue", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the queue" },
- "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry [...]
"configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.sqs.SqsConfiguration", "deprecated": false, "secret": false, "description": "The component configuration" },
"protocol": { "kind": "property", "displayName": "Protocol", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "https", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The underlying protocol used to communicate with SQS" },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the SQS client" },
@@ -66,7 +65,6 @@
"amazonAWSHost": { "kind": "parameter", "displayName": "Amazon AWSHost", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "amazonaws.com", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The hostname of the Amazon AWS cloud." },
"amazonSQSClient": { "kind": "parameter", "displayName": "Amazon SQSClient", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.services.sqs.AmazonSQS", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To use the AmazonSQS as client" },
"autoCreateQueue": { "kind": "parameter", "displayName": "Auto Create Queue", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the queue" },
- "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registr [...]
"headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel." },
"protocol": { "kind": "parameter", "displayName": "Protocol", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "https", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The underlying protocol used to communicate with SQS" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the SQS client" },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
index 89fd007..34d7058 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
@@ -23,7 +23,6 @@
"componentProperties": {
"amazonSNSClient": { "kind": "property", "displayName": "Amazon SNSClient", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sns.SnsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "To use the AmazonSNS as the client" },
"autoCreateTopic": { "kind": "property", "displayName": "Auto Create Topic", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Setting the autocreation of the topic" },
- "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the regist [...]
"configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.sns.Sns2Configuration", "deprecated": false, "secret": false, "description": "Component configuration" },
"kmsMasterKeyId": { "kind": "property", "displayName": "Kms Master Key Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK." },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
@@ -46,7 +45,6 @@
"topicNameOrArn": { "kind": "path", "displayName": "Topic Name Or Arn", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "Topic name or ARN" },
"amazonSNSClient": { "kind": "parameter", "displayName": "Amazon SNSClient", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sns.SnsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "To use the AmazonSNS as the client" },
"autoCreateTopic": { "kind": "parameter", "displayName": "Auto Create Topic", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Setting the autocreation of the topic" },
- "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the regis [...]
"headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel." },
"kmsMasterKeyId": { "kind": "parameter", "displayName": "Kms Master Key Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
index d5d8d8a..d90ae35 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
@@ -24,7 +24,6 @@
"amazonAWSHost": { "kind": "property", "displayName": "Amazon AWSHost", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "amazonaws.com", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The hostname of the Amazon AWS cloud." },
"amazonSQSClient": { "kind": "property", "displayName": "Amazon SQSClient", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sqs.SqsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To use the AmazonSQS as client" },
"autoCreateQueue": { "kind": "property", "displayName": "Auto Create Queue", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Setting the autocreation of the queue" },
- "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the regist [...]
"configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "deprecated": false, "secret": false, "description": "The AWS SQS default configuration" },
"protocol": { "kind": "property", "displayName": "Protocol", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "https", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The underlying protocol used to communicate with SQS" },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the SQS client" },
@@ -67,7 +66,6 @@
"amazonAWSHost": { "kind": "parameter", "displayName": "Amazon AWSHost", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "amazonaws.com", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The hostname of the Amazon AWS cloud." },
"amazonSQSClient": { "kind": "parameter", "displayName": "Amazon SQSClient", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sqs.SqsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To use the AmazonSQS as client" },
"autoCreateQueue": { "kind": "parameter", "displayName": "Auto Create Queue", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Setting the autocreation of the queue" },
- "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the regis [...]
"headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel." },
"protocol": { "kind": "parameter", "displayName": "Protocol", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "https", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The underlying protocol used to communicate with SQS" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the SQS client" },
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogCacheTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogCacheTest.java
index 01abbb9..e8b488c 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogCacheTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogCacheTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.catalog;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
public class CamelCatalogCacheTest extends CamelCatalogTest {
- @BeforeClass
+ @BeforeAll
public static void createCamelCatalog() {
catalog = new DefaultCamelCatalog(true);
}
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogJsonSchemaTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogJsonSchemaTest.java
index 486d22d..d29cc7e 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogJsonSchemaTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogJsonSchemaTest.java
@@ -24,12 +24,14 @@ import java.util.Map;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelCatalogJsonSchemaTest {
@@ -49,9 +51,9 @@ public class CamelCatalogJsonSchemaTest {
JsonNode tree = mapper.readTree(json);
assertNotNull(tree);
- assertTrue(name, tree.has("component"));
- assertTrue(name, tree.has("componentProperties"));
- assertTrue(name, tree.has("properties"));
+ assertTrue(tree.has("component"), name);
+ assertTrue(tree.has("componentProperties"), name);
+ assertTrue(tree.has("properties"), name);
validateComponentSyntax(name, tree);
}
@@ -59,7 +61,7 @@ public class CamelCatalogJsonSchemaTest {
private void validateComponentSyntax(String name, JsonNode tree) {
String syntax = tree.get("component").get("syntax").textValue();
- assertFalse("Empty syntax for component " + name, syntax.isEmpty());
+ assertFalse(syntax.isEmpty(), "Empty syntax for component " + name);
List<String> pathProperties = new ArrayList<>();
List<String> requiredProperties = new ArrayList<>();
@@ -74,16 +76,16 @@ public class CamelCatalogJsonSchemaTest {
}
}
List<String> syntaxParts = Arrays.asList(syntax.split("[/:#.]"));
- Assert.assertEquals("Syntax must start with component name", name, syntaxParts.get(0));
+ assertEquals(name, syntaxParts.get(0), "Syntax must start with component name");
for (String part : syntaxParts.subList(1, syntaxParts.size())) {
if (!part.isEmpty()) {
- Assert.assertTrue(String.format("Component %s. Syntax %s. Part %s is not defined as UriPath", name, syntax, part), pathProperties.contains(part));
+ assertTrue(pathProperties.contains(part), String.format("Component %s. Syntax %s. Part %s is not defined as UriPath", name, syntax, part));
}
}
for (String requiredPart : requiredProperties) {
- Assert.assertTrue(String.format("Component %s. Syntax %s. Required param %s is not defined in syntax", name, syntax, requiredPart), syntaxParts.contains(requiredPart));
+ assertTrue(syntaxParts.contains(requiredPart), String.format("Component %s. Syntax %s. Required param %s is not defined in syntax", name, syntax, requiredPart));
}
}
@@ -99,8 +101,8 @@ public class CamelCatalogJsonSchemaTest {
JsonNode tree = mapper.readTree(json);
assertNotNull(tree);
- assertTrue(name, tree.has("dataformat"));
- assertTrue(name, tree.has("properties"));
+ assertTrue(tree.has("dataformat"), name);
+ assertTrue(tree.has("properties"), name);
}
}
@@ -116,8 +118,8 @@ public class CamelCatalogJsonSchemaTest {
JsonNode tree = mapper.readTree(json);
assertNotNull(tree);
- assertTrue(name, tree.has("language"));
- assertTrue(name, tree.has("properties"));
+ assertTrue(tree.has("language"), name);
+ assertTrue(tree.has("properties"), name);
}
}
@@ -133,8 +135,8 @@ public class CamelCatalogJsonSchemaTest {
JsonNode tree = mapper.readTree(json);
assertNotNull(tree);
- assertTrue(name, tree.has("model"));
- assertTrue(name, tree.has("properties"));
+ assertTrue(tree.has("model"), name);
+ assertTrue(tree.has("properties"), name);
}
}
}
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index ade74e4..7c8a0d6 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -24,17 +24,17 @@ import java.util.Map;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.camel.catalog.impl.CatalogHelper.loadText;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelCatalogTest {
@@ -42,7 +42,7 @@ public class CamelCatalogTest {
private static final Logger LOG = LoggerFactory.getLogger(CamelCatalogTest.class);
- @BeforeClass
+ @BeforeAll
public static void createCamelCatalog() {
catalog = new DefaultCamelCatalog();
}
[camel] 14/43: [CAMEL-11807] Upgrade camel-optaplanner to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91a49f7354a53c8b1fa5aa8793baeeaf9f72213c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:42:28 2020 +0200
[CAMEL-11807] Upgrade camel-optaplanner to junit5
---
components/camel-optaplanner/pom.xml | 6 +++---
.../camel/component/optaplanner/OptaPlannerAsyncSolverTest.java | 9 +++++++--
.../camel/component/optaplanner/OptaPlannerConsumerTest.java | 9 +++++++--
.../camel/component/optaplanner/OptaPlannerDaemonSolverTest.java | 8 ++++++--
.../camel/component/optaplanner/OptaPlannerSyncSolverTest.java | 9 +++++++--
5 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml
index bff2789..a24f8f8 100644
--- a/components/camel-optaplanner/pom.xml
+++ b/components/camel-optaplanner/pom.xml
@@ -68,12 +68,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncSolverTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncSolverTest.java
index 800fbe9..e83a744 100644
--- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncSolverTest.java
+++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerAsyncSolverTest.java
@@ -17,11 +17,16 @@
package org.apache.camel.component.optaplanner;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.optaplanner.examples.cloudbalancing.domain.CloudBalance;
import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* OptaPlanner unit test with Camel
*/
diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java
index 62a55e0..05aeb19 100644
--- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java
+++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerConsumerTest.java
@@ -17,11 +17,16 @@
package org.apache.camel.component.optaplanner;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.optaplanner.examples.cloudbalancing.domain.CloudBalance;
import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* OptaPlanner unit test with Camel
*/
diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java
index 07e4378..5f978b5 100644
--- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java
+++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerDaemonSolverTest.java
@@ -22,8 +22,8 @@ import java.util.Objects;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.optaplanner.core.impl.score.director.ScoreDirector;
import org.optaplanner.core.impl.solver.ProblemFactChange;
import org.optaplanner.examples.cloudbalancing.domain.CloudBalance;
@@ -31,6 +31,10 @@ import org.optaplanner.examples.cloudbalancing.domain.CloudComputer;
import org.optaplanner.examples.cloudbalancing.domain.CloudProcess;
import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* OptaPlanner unit test with Camel
*/
diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncSolverTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncSolverTest.java
index ceb0ce3..e128c16 100644
--- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncSolverTest.java
+++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerSyncSolverTest.java
@@ -17,11 +17,16 @@
package org.apache.camel.component.optaplanner;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.optaplanner.examples.cloudbalancing.domain.CloudBalance;
import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* OptaPlanner unit test with Camel
*/
[camel] 05/43: [CAMEL-11807] Upgrade camel-xstream to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0c964a5e419ee56069671837e0ece463b01bd7ba
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 11:17:46 2020 +0200
[CAMEL-11807] Upgrade camel-xstream to junit5
---
components/camel-xstream/pom.xml | 6 +++---
.../xstream/MarshalDomainObjectJSONDropRootNodeTest.java | 1 -
.../apache/camel/dataformat/xstream/MarshalListTest.java | 4 ++--
.../camel/dataformat/xstream/UnmarshalThenMarshalTest.java | 14 ++++++++++----
.../camel/dataformat/xstream/XStreamConcurrencyTest.java | 6 ++++--
.../camel/dataformat/xstream/XStreamConfigurationTest.java | 12 +++++++-----
.../xstream/XStreamDataFormatDriverConfigTest.java | 6 ++++--
7 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index c19a52a..7c774b6 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -71,7 +71,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,8 +100,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java
index a64b95e..23a0cbe 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.model.dataformat.JsonLibrary;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MarshalDomainObjectJSONDropRootNodeTest extends CamelTestSupport {
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
index 03a849d..e1f88f4 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Marshal tests with List objects.
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java
index 00a2bf7..10f07e4 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java
@@ -22,11 +22,17 @@ 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.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UnmarshalThenMarshalTest extends CamelTestSupport {
-
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testSendXmlAndUnmarshal() throws Exception {
@@ -47,7 +53,7 @@ public class UnmarshalThenMarshalTest extends CamelTestSupport {
Object actualBody = exchange.getIn().getBody();
log.debug("Received: " + actualBody);
- assertEquals("Received body", expectedBody, actualBody);
+ assertEquals(expectedBody, actualBody, "Received body");
}
@Override
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java
index 84a4fc1..e09911e 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java
@@ -21,8 +21,10 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
public class XStreamConcurrencyTest extends CamelTestSupport {
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
index ff904ec..00fd9a5 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
@@ -31,9 +31,11 @@ import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.dataformat.XStreamDataFormat;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Marshal tests with domain objects.
@@ -44,7 +46,7 @@ public class XStreamConfigurationTest extends CamelTestSupport {
private static volatile boolean methodInjected;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
constructorInjected = false;
@@ -124,7 +126,7 @@ public class XStreamConfigurationTest extends CamelTestSupport {
mock.assertIsSatisfied();
String result = mock.getExchanges().get(0).getIn().getBody(String.class);
// make sure the result is start with "{"
- assertTrue("Should get a json result", result.startsWith("{"));
+ assertTrue(result.startsWith("{"), "Should get a json result");
}
@Override
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java
index 4935cbb..f52d6fc 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.dataformat.xstream;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class XStreamDataFormatDriverConfigTest extends CamelTestSupport {
[camel] 31/43: [CAMEL-11807] Upgrade camel-swagger-java to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d2b49587e23678106981c864c646b2fbc42132a5
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:07:50 2020 +0200
[CAMEL-11807] Upgrade camel-swagger-java to junit5
---
components/camel-swagger-java/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 3ae3a41..75b1f9b 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -153,7 +153,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
[camel] 01/43: [CAMEL-11807] Upgrade camel-workday to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 006893a9951baf7936e8fba987f42354f35e78a2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 09:54:35 2020 +0200
[CAMEL-11807] Upgrade camel-workday to junit5
---
components/camel-workday/pom.xml | 6 +++---
.../apache/camel/WorkdayCommonAPIProducerTest.java | 19 ++++++++++++-------
.../org/apache/camel/WorkdayReportProducerTest.java | 9 ++++++---
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/components/camel-workday/pom.xml b/components/camel-workday/pom.xml
index 6fd6d58..de09a97 100644
--- a/components/camel-workday/pom.xml
+++ b/components/camel-workday/pom.xml
@@ -61,12 +61,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java b/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java
index 3d12e84..44ab6e1 100644
--- a/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java
+++ b/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java
@@ -22,8 +22,12 @@ import org.apache.camel.component.workday.WorkdayComponent;
import org.apache.camel.component.workday.WorkdayConfiguration;
import org.apache.camel.component.workday.WorkdayEndpoint;
import org.apache.camel.component.workday.producer.WorkdayCommonAPIProducer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
public class WorkdayCommonAPIProducerTest extends CamelTestSupport {
@@ -62,7 +66,7 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport {
return;
}
- assertTrue("Required parameters validation failed.", false);
+ fail("Required parameters validation failed.");
}
@Test
@@ -86,7 +90,7 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport {
return;
}
- assertTrue("Required parameters validation failed.", false);
+ fail("Required parameters validation failed.");
}
@Test
@@ -121,7 +125,7 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport {
assertEquals(workdayUri, "https://impl.workday.com/ccx/api/v1/camel/workers/4ab56f4b34c4b4a2be3e4f5a732c2343/paySlips/4ab56f4c39c4b4a2bf3e4f5a732c2343");
}
- @Test(expected = Test.None.class /* no exception expected */)
+ @Test
public void createProducerCurrenciesValidConfiguration() throws Exception {
WorkdayComponent workdayComponent = context.getComponent("workday", WorkdayComponent.class);
@@ -135,7 +139,7 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport {
workdayProducer.prepareUri(workdayEndpoint.getWorkdayConfiguration());
}
- @Test(expected = MalformedURLException.class /* no exception expected */)
+ @Test
public void createProducerCurrenciesInvalidIDConfiguration() throws Exception {
WorkdayComponent workdayComponent = context.getComponent("workday", WorkdayComponent.class);
@@ -146,7 +150,8 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport {
WorkdayCommonAPIProducer workdayProducer = new WorkdayCommonAPIProducer(workdayEndpoint);
- workdayProducer.prepareUri(workdayEndpoint.getWorkdayConfiguration());
+ assertThrows(MalformedURLException.class,
+ () -> workdayProducer.prepareUri(workdayEndpoint.getWorkdayConfiguration()));
}
}
diff --git a/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java b/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java
index 776c94f..20643bc 100644
--- a/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java
+++ b/components/camel-workday/src/test/java/org/apache/camel/WorkdayReportProducerTest.java
@@ -20,8 +20,11 @@ import org.apache.camel.component.workday.WorkdayComponent;
import org.apache.camel.component.workday.WorkdayConfiguration;
import org.apache.camel.component.workday.WorkdayEndpoint;
import org.apache.camel.component.workday.producer.WorkdayReportProducer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class WorkdayReportProducerTest extends CamelTestSupport {
@@ -60,7 +63,7 @@ public class WorkdayReportProducerTest extends CamelTestSupport {
return;
}
- assertTrue("Required parameters validation failed.", false);
+ fail("Required parameters validation failed.");
}
@Test
[camel] 03/43: [CAMEL-11807] Upgrade camel-xmlsecurity to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 203f94600d650f81158481f51a8472b1c08eaea1
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 10:53:14 2020 +0200
[CAMEL-11807] Upgrade camel-xmlsecurity to junit5
---
components/camel-xmlsecurity/pom.xml | 11 +-
.../component/xmlsecurity/ECDSASignatureTest.java | 17 ++-
.../xmlsecurity/SignatureAlgorithmTest.java | 10 +-
.../xmlsecurity/SignatureDigestMethodTest.java | 10 +-
.../xmlsecurity/SpringXmlSignatureTest.java | 2 +-
.../xmlsecurity/XAdESSignaturePropertiesTest.java | 121 +++++++++++++--------
.../component/xmlsecurity/XmlSignatureTest.java | 68 ++++++------
.../xmlsecurity/EncryptionAlgorithmTest.java | 8 +-
.../SpringXmlSecurityDataFormatTest.java | 7 +-
...ngXmlSecurityDataFormatWithKeyPasswordTest.java | 7 +-
.../camel/dataformat/xmlsecurity/TestHelper.java | 12 +-
.../xmlsecurity/XMLEncryption11Test.java | 8 +-
.../xmlsecurity/XMLSecurityConcurrencyTest.java | 10 +-
.../xmlsecurity/XMLSecurityDataFormatTest.java | 15 +--
14 files changed, 176 insertions(+), 130 deletions(-)
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index 0683204..eacd7aa 100644
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -70,7 +70,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -79,8 +84,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
index 7f66ca1..b973d0a 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
@@ -38,17 +38,22 @@ import org.apache.camel.component.xmlsecurity.api.KeyAccessor;
import org.apache.camel.component.xmlsecurity.util.SameDocumentUriDereferencer;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
/**
* Test for the ECDSA algorithms
*/
public class ECDSASignatureTest extends CamelTestSupport {
-
+
private static String payload;
+ private Logger log = LoggerFactory.getLogger(getClass());
private boolean canTest = true;
static {
@@ -241,7 +246,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
disableJMX();
try {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
index 9e8f71e..59851e5 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
@@ -73,10 +73,10 @@ import org.apache.camel.component.xmlsecurity.util.XmlSignature2Message2MessageW
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test signing using all available signature methods, apart from EC-algorithms which are
@@ -462,7 +462,7 @@ public class SignatureAlgorithmTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
setUpKeys("RSA", 2048);
disableJMX();
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
index c8189f7..504ee26 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
@@ -72,10 +72,10 @@ import org.apache.camel.component.xmlsecurity.util.XmlSignature2Message2MessageW
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test signing using all available digest methods
@@ -353,7 +353,7 @@ public class SignatureDigestMethodTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
setUpKeys("RSA", 1024);
disableJMX();
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java
index e0352ce..220ca5d 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java
@@ -33,7 +33,7 @@ import org.apache.camel.component.xmlsecurity.api.XmlSignatureHelper;
import org.apache.camel.spi.Registry;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringXmlSignatureTest extends XmlSignatureTest {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
index b1896dc..afa985f 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
@@ -67,12 +67,17 @@ import org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties;
import org.apache.camel.component.xmlsecurity.util.TestKeystore;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.xmlsecurity.XmlSignatureTest.checkThrownException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class XAdESSignaturePropertiesTest extends CamelTestSupport {
@@ -90,7 +95,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
disableJMX();
super.setUp();
@@ -623,104 +628,124 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
+ " The correct namespace is 'http://uri.etsi.org/01903/v1.3.2#'.", null);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void namespaceNull() throws Exception {
- new XAdESSignatureProperties().setNamespace(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setNamespace(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void signingCertificateURIsNull() throws Exception {
- new XAdESSignatureProperties().setSigningCertificateURIs(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSigningCertificateURIs(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void sigPolicyInvalid() throws Exception {
- new XAdESSignatureProperties().setSignaturePolicy("invalid");
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSignaturePolicy("invalid"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void sigPolicyIdDocumentationReferencesNull() throws Exception {
- new XAdESSignatureProperties().setSigPolicyIdDocumentationReferences(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSigPolicyIdDocumentationReferences(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void sigPolicyIdDocumentationReferencesNullEntry() throws Exception {
- new XAdESSignatureProperties().setSigPolicyIdDocumentationReferences(Collections.<String> singletonList(null));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSigPolicyIdDocumentationReferences(Collections.<String> singletonList(null)));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void sigPolicyIdDocumentationReferencesEmptyEntry() throws Exception {
- new XAdESSignatureProperties().setSigPolicyIdDocumentationReferences(Collections.<String> singletonList(""));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSigPolicyIdDocumentationReferences(Collections.<String> singletonList("")));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void dataObjectFormatIdentifierDocumentationReferencesNull() throws Exception {
- new XAdESSignatureProperties().setDataObjectFormatIdentifierDocumentationReferences(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setDataObjectFormatIdentifierDocumentationReferences(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void dataObjectFormatIdentifierDocumentationReferencesNullEntry() throws Exception {
- new XAdESSignatureProperties().setDataObjectFormatIdentifierDocumentationReferences(Collections.<String> singletonList(null));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setDataObjectFormatIdentifierDocumentationReferences(Collections.<String> singletonList(null)));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void dataObjectFormatIdentifierDocumentationReferencesEmptyEntry() throws Exception {
- new XAdESSignatureProperties().setDataObjectFormatIdentifierDocumentationReferences(Collections.<String> singletonList(""));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setDataObjectFormatIdentifierDocumentationReferences(Collections.<String> singletonList("")));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void signerClaimedRolesNull() throws Exception {
- new XAdESSignatureProperties().setSignerClaimedRoles(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSignerClaimedRoles(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void signerClaimedRolesNullEntry() throws Exception {
- new XAdESSignatureProperties().setSignerClaimedRoles(Collections.<String> singletonList(null));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSignerClaimedRoles(Collections.<String> singletonList(null)));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void signerClaimedRolesEmptyEntry() throws Exception {
- new XAdESSignatureProperties().setSignerClaimedRoles(Collections.<String> singletonList(""));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSignerClaimedRoles(Collections.<String> singletonList("")));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void signerCertifiedRolesNull() throws Exception {
- new XAdESSignatureProperties().setSignerCertifiedRoles(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSignerCertifiedRoles(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void signerCertifiedRolesNullEntry() throws Exception {
- new XAdESSignatureProperties().setSignerCertifiedRoles(Collections.<XAdESEncapsulatedPKIData> singletonList(null));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setSignerCertifiedRoles(Collections.<XAdESEncapsulatedPKIData> singletonList(null)));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void commitmentTypeIdDocumentationReferencesNull() throws Exception {
- new XAdESSignatureProperties().setCommitmentTypeIdDocumentationReferences(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setCommitmentTypeIdDocumentationReferences(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void commitmentTypeIdDocumentationReferencesNullEntry() throws Exception {
- new XAdESSignatureProperties().setCommitmentTypeIdDocumentationReferences(Collections.<String> singletonList(null));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setCommitmentTypeIdDocumentationReferences(Collections.<String> singletonList(null)));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void commitmentTypeIdDocumentationReferencesEmptyEntry() throws Exception {
- new XAdESSignatureProperties().setCommitmentTypeIdDocumentationReferences(Collections.<String> singletonList(""));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setCommitmentTypeIdDocumentationReferences(Collections.<String> singletonList("")));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void commitmentTypeQualifiersNull() throws Exception {
- new XAdESSignatureProperties().setCommitmentTypeQualifiers(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setCommitmentTypeQualifiers(null));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void commitmentTypeQualifiersNullEntry() throws Exception {
- new XAdESSignatureProperties().setCommitmentTypeQualifiers(Collections.<String> singletonList(null));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setCommitmentTypeQualifiers(Collections.<String> singletonList(null)));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void commitmentTypeQualifiersEmptyEntry() throws Exception {
- new XAdESSignatureProperties().setCommitmentTypeQualifiers(Collections.<String> singletonList(""));
+ assertThrows(IllegalArgumentException.class,
+ () -> new XAdESSignatureProperties().setCommitmentTypeQualifiers(Collections.<String> singletonList("")));
}
//
@@ -850,7 +875,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
if (startsWith) {
assertTrue(result.startsWith(expectedResult));
} else if (NOT_EMPTY.equals(expectedResult)) {
- assertTrue("Not empty result for xpath " + xpathString + " expected", !result.isEmpty());
+ assertTrue(!result.isEmpty(), "Not empty result for xpath " + xpathString + " expected");
} else {
assertEquals(expectedResult, result);
}
@@ -862,9 +887,9 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
XPathExpression expr = getXpath(xpathString, prefix2Namespace);
Object result = expr.evaluate(doc, XPathConstants.NODE);
if (exists) {
- assertNotNull("The xpath " + xpathString + " returned null, expected was a node", result);
+ assertNotNull(result, "The xpath " + xpathString + " returned null, expected was a node");
} else {
- assertNull("The xpath " + xpathString + " returned a node, expected was none: ", result);
+ assertNull(result, "The xpath " + xpathString + " returned a node, expected was none: ");
}
}
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
index b4949ca..c018394 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
@@ -100,11 +100,17 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.support.processor.validation.SchemaValidationException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class XmlSignatureTest extends CamelTestSupport {
@@ -474,7 +480,7 @@ public class XmlSignatureTest extends CamelTestSupport {
headers.put(XmlSignatureConstants.HEADER_OMIT_XML_DECLARATION, Boolean.TRUE);
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopedXmlSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchelementname", payload, headers);
assertMockEndpointsSatisfied();
}
@@ -561,7 +567,7 @@ public class XmlSignatureTest extends CamelTestSupport {
setupMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopedXmlSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchelementname", payload);
assertMockEndpointsSatisfied();
}
@@ -575,7 +581,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopedXmlSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchelementname", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class, null);
@@ -591,7 +597,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopedXmlSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchelementname", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class, null);
@@ -602,7 +608,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopingDigSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchelementname", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class, null);
@@ -613,7 +619,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopingDigSigWithSeveralElementsWithNameRoot.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchelementname", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class, null);
@@ -624,7 +630,7 @@ public class XmlSignatureTest extends CamelTestSupport {
setupMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopedXmlSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchxpath", payload);
assertMockEndpointsSatisfied();
}
@@ -634,7 +640,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopingDigSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchxpath", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class, null);
@@ -645,7 +651,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopingDigSigWithSeveralElementsWithNameRoot.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:outputnodesearchxpath", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class, null);
@@ -697,11 +703,11 @@ public class XmlSignatureTest extends CamelTestSupport {
}
@Test
- @Ignore("Cannot resolve <Reference URI=\"testFile.txt\">")
+ @Disabled("Cannot resolve <Reference URI=\"testFile.txt\">")
public void testVerifyInvalidContentHashException() throws Exception {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleDetached.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:invalidhash", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureInvalidContentHashException.class, null);
@@ -712,7 +718,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ManifestTest_TamperedContent.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:invalidhash", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureInvalidContentHashException.class, null);
@@ -727,13 +733,13 @@ public class XmlSignatureTest extends CamelTestSupport {
setupMock("some text tampered");
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ManifestTest_TamperedContent.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:cryptocontextprops", payload);
assertMockEndpointsSatisfied();
}
@Test
- @Ignore("Not all JDKs have provider to verify this key")
+ @Disabled("Not all JDKs have provider to verify this key")
public void testVerifySignatureInvalidValueException() throws Exception {
MockEndpoint mock = setupExceptionMock();
setUpKeys("DSA", 512);
@@ -742,7 +748,7 @@ public class XmlSignatureTest extends CamelTestSupport {
// payload needs DSA key
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopingDigSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:verifyexceptions", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureInvalidValueException.class, null);
@@ -753,7 +759,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopingDigSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:verifyInvalidKeyException", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureInvalidKeyException.class, null);
@@ -771,7 +777,7 @@ public class XmlSignatureTest extends CamelTestSupport {
MockEndpoint mock = setupExceptionMock();
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopedXmlSig.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:xmlSignatureChecker", payload);
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureInvalidException.class, null);
@@ -782,7 +788,7 @@ public class XmlSignatureTest extends CamelTestSupport {
setupMock("some text tampered");
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ManifestTest_TamperedContent.xml");
- assertNotNull("Cannot load payload", payload);
+ assertNotNull(payload, "Cannot load payload");
sendBody("direct:validationFailedHandler", payload);
assertMockEndpointsSatisfied();
}
@@ -835,7 +841,7 @@ public class XmlSignatureTest extends CamelTestSupport {
// already
Element sigEle = testDetachedSignatureInternal();
Attr attr = sigEle.getAttributeNode("Id");
- assertNull("Signature element contains Id attribute", attr);
+ assertNull(attr, "Signature element contains Id attribute");
}
@Test
@@ -857,7 +863,7 @@ public class XmlSignatureTest extends CamelTestSupport {
Element sigEle = testDetachedSignatureInternal();
String value = sigEle.getAttribute("Id");
assertNotNull("Signature Id is null", value);
- assertTrue("Signature Id value does not start with '_'", value.startsWith("_"));
+ assertTrue(value.startsWith("_"), "Signature Id value does not start with '_'");
}
private Element testDetachedSignatureInternal() throws InterruptedException, XPathExpressionException, SAXException, IOException,
@@ -1266,8 +1272,8 @@ public class XmlSignatureTest extends CamelTestSupport {
Message message = getMessage(mock);
String body = message.getBody(String.class);
assertNotNull(body);
- assertTrue("The message body " + body + " does not contain the expected string " + expectedPartContent,
- body.contains(expectedPartContent));
+ assertTrue(body.contains(expectedPartContent),
+ "The message body " + body + " does not contain the expected string " + expectedPartContent);
}
private Object checkXpath(MockEndpoint mock, String xpathString, final Map<String, String> prefix2Namespace)
@@ -1298,7 +1304,7 @@ public class XmlSignatureTest extends CamelTestSupport {
xpath.setNamespaceContext(nc);
XPathExpression expr = xpath.compile(xpathString);
Object result = expr.evaluate(XmlSignatureHelper.newDocumentBuilder(true).parse(body), XPathConstants.NODE);
- assertNotNull("The xpath " + xpathString + " returned a null value", result);
+ assertNotNull(result, "The xpath " + xpathString + " returned a null value");
return result;
}
@@ -1320,7 +1326,7 @@ public class XmlSignatureTest extends CamelTestSupport {
static void checkThrownException(MockEndpoint mock, Class<? extends Exception> cl, String expectedMessage,
Class<? extends Exception> expectedCauseClass) throws Exception {
Exception e = (Exception) mock.getExchanges().get(0).getProperty(Exchange.EXCEPTION_CAUGHT);
- assertNotNull("Expected excpetion " + cl.getName() + " missing", e);
+ assertNotNull(e, "Expected excpetion " + cl.getName() + " missing");
if (e.getClass() != cl) {
String stackTrace = getStrackTrace(e);
fail("Exception " + cl.getName() + " excpected, but was " + e.getClass().getName() + ": " + stackTrace);
@@ -1330,7 +1336,7 @@ public class XmlSignatureTest extends CamelTestSupport {
}
if (expectedCauseClass != null) {
Throwable cause = e.getCause();
- assertNotNull("Expected cause exception" + expectedCauseClass.getName() + " missing", cause);
+ assertNotNull(cause, "Expected cause exception" + expectedCauseClass.getName() + " missing");
if (expectedCauseClass != cause.getClass()) {
fail("Cause exception " + expectedCauseClass.getName() + " expected, but was " + cause.getClass().getName() + ": "
+ getStrackTrace(e));
@@ -1392,7 +1398,7 @@ public class XmlSignatureTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
setUpKeys("RSA", 1024);
disableJMX();
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
index 3261b0c..d7575fd 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
@@ -27,10 +27,10 @@ import javax.xml.transform.OutputKeys;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.support.jsse.KeyStoreParameters;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.xml.security.encryption.XMLCipher;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test all available encryption algorithms
@@ -57,7 +57,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
context.getGlobalOptions().put(XmlConverter.OUTPUT_PROPERTIES_PREFIX + OutputKeys.ENCODING, "UTF-8");
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java
index e5c27bb..53124ae 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest.java
@@ -18,12 +18,11 @@ package org.apache.camel.dataformat.xmlsecurity;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SpringXmlSecurityDataFormatTest implements CamelContextAware {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java
index 501818da..6633ee5 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest.java
@@ -18,12 +18,11 @@ package org.apache.camel.dataformat.xmlsecurity;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SpringXmlSecurityDataFormatWithKeyPasswordTest implements CamelContextAware {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
index eea2440..f48fd92 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java
@@ -35,12 +35,14 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.xml.security.encryption.XMLCipher;
import org.apache.xml.security.encryption.XMLEncryptionException;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Diff;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class TestHelper {
protected static final String NS_XML_FRAGMENT = "<ns1:cheesesites xmlns:ns1=\"http://cheese.xmlsecurity.camel.apache.org/\">"
@@ -134,7 +136,7 @@ public class TestHelper {
if (log.isDebugEnabled()) {
logMessage(exchange, inDoc);
}
- Assert.assertTrue("The XML message has no encrypted data.", hasEncryptedData(inDoc));
+ assertTrue(hasEncryptedData(inDoc), "The XML message has no encrypted data.");
return inDoc;
}
@@ -155,12 +157,12 @@ public class TestHelper {
if (log.isDebugEnabled()) {
logMessage(exchange, inDoc);
}
- Assert.assertFalse("The XML message has encrypted data.", hasEncryptedData(inDoc));
+ assertFalse(hasEncryptedData(inDoc), "The XML message has encrypted data.");
// verify that the decrypted message matches what was sent
Diff xmlDiff = DiffBuilder.compare(fragment).withTest(inDoc).checkForIdentical().build();
- Assert.assertFalse("The decrypted document does not match the control document:\n" + xmlDiff.toString(), xmlDiff.hasDifferences());
+ assertFalse(xmlDiff.hasDifferences(), "The decrypted document does not match the control document:\n" + xmlDiff.toString());
}
protected void testDecryption(CamelContext context) throws Exception {
@@ -177,7 +179,7 @@ public class TestHelper {
XmlConverter converter = new XmlConverter();
String xmlStr = converter.toString(inDoc, exchange);
log.info(xmlStr);
- Assert.assertFalse("The XML message has encrypted data.", hasEncryptedData(inDoc));
+ assertFalse(hasEncryptedData(inDoc), "The XML message has encrypted data.");
}
private boolean hasEncryptedData(Document doc) throws Exception {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
index 3beeb57..3a302be 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
@@ -26,11 +26,11 @@ import javax.xml.transform.OutputKeys;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.support.jsse.KeyStoreParameters;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.xml.security.encryption.XMLCipher;
import org.apache.xml.security.utils.EncryptionConstants;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Some unit tests for XML Encryption 1.1 functionality
@@ -59,7 +59,7 @@ public class XMLEncryption11Test extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
context.getGlobalOptions().put(XmlConverter.OUTPUT_PROPERTIES_PREFIX + OutputKeys.ENCODING, "UTF-8");
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
index 53ab358..a6f794b 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
@@ -25,8 +25,12 @@ import java.util.concurrent.Executors;
import javax.crypto.KeyGenerator;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class XMLSecurityConcurrencyTest extends CamelTestSupport {
@@ -61,7 +65,7 @@ public class XMLSecurityConcurrencyTest extends CamelTestSupport {
String secure = getMockEndpoint("mock:secure").getReceivedExchanges().get(0).getIn().getBody(String.class);
assertNotNull(secure);
- assertTrue("Should not be readable", secure.indexOf("read") == -1);
+ assertTrue(secure.indexOf("read") == -1, "Should not be readable");
executor.shutdownNow();
}
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
index 548599a..07f50ba 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
@@ -32,12 +32,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.support.jsse.KeyStoreParameters;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.codec.Charsets;
import org.apache.xml.security.encryption.XMLCipher;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test of the encryptXML data format.
@@ -56,7 +57,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
context.getGlobalOptions().put(XmlConverter.OUTPUT_PROPERTIES_PREFIX + OutputKeys.ENCODING, "UTF-8");
@@ -208,7 +209,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
Document doc = xmlsecTestHelper.testEncryption(TestHelper.XML_FRAGMENT, context);
NodeList nodeList =
doc.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
- Assert.assertTrue(nodeList.getLength() > 0);
+ assertTrue(nodeList.getLength() > 0);
}
@Test
@@ -232,7 +233,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
Document doc = xmlsecTestHelper.testEncryption(TestHelper.XML_FRAGMENT, context);
NodeList nodeList =
doc.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
- Assert.assertTrue(nodeList.getLength() == 0);
+ assertTrue(nodeList.getLength() == 0);
}
/*
[camel] 07/43: [CAMEL-11807] Upgrade camel-zip-deflater to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d594e262f11ff1989dd693efa3bc40c9b52035dd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 11:27:48 2020 +0200
[CAMEL-11807] Upgrade camel-zip-deflater to junit5
---
components/camel-zip-deflater/pom.xml | 6 +++---
.../deflater/GzipDataFormatFileDeleteTest.java | 17 ++++++++++-------
.../deflater/GzipDataFormatFileUnmarshalDeleteTest.java | 16 +++++++++-------
.../camel/dataformat/deflater/GzipDataFormatTest.java | 8 +++++---
.../deflater/ZipDeflaterDataFormatFileDeleteTest.java | 17 ++++++++++-------
.../ZipDeflaterDataFormatFileUnmarshalDeleteTest.java | 15 +++++++++------
.../dataformat/deflater/ZipDeflaterDataFormatTest.java | 8 ++++++--
7 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/components/camel-zip-deflater/pom.xml b/components/camel-zip-deflater/pom.xml
index 5ed54e3..fd85c6f 100644
--- a/components/camel-zip-deflater/pom.xml
+++ b/components/camel-zip-deflater/pom.xml
@@ -43,13 +43,13 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java
index 1097b4a..0a9b24e 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java
@@ -21,15 +21,18 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GzipDataFormatFileDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/gzip");
super.setUp();
@@ -49,10 +52,10 @@ public class GzipDataFormatFileDeleteTest extends CamelTestSupport {
oneExchangeDone.matchesWaitTime();
File in = new File("target/data/gzip/hello.txt");
- Assert.assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/data/gzip/out/hello.txt.gz");
- Assert.assertTrue("Should have been created " + out, out.exists());
+ assertTrue(out.exists(), "Should have been created " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java
index 8327abd..27f8e3e 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java
@@ -21,15 +21,17 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class GzipDataFormatFileUnmarshalDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/gzip");
super.setUp();
@@ -47,10 +49,10 @@ public class GzipDataFormatFileUnmarshalDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
File in = new File("target/gzip/hello.txt");
- Assert.assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/gzip/out/hello.txt.gz");
- Assert.assertFalse("Should have been deleted " + out, out.exists());
+ assertFalse(out.exists(), "Should have been deleted " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
index f06dbdb..0564677 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
@@ -23,8 +23,10 @@ import java.util.zip.GZIPInputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Unit test of the gzip data format.
@@ -59,7 +61,7 @@ public class GzipDataFormatTest extends CamelTestSupport {
GZIPInputStream stream = new GZIPInputStream(new ByteArrayInputStream(output));
String result = IOConverter.toString(stream, null);
- assertEquals("Uncompressed something different than compressed", TEXT, result);
+ assertEquals(TEXT, result, "Uncompressed something different than compressed");
}
@Test
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java
index 8a86851..3807e1c 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java
@@ -21,15 +21,18 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ZipDeflaterDataFormatFileDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/zip");
super.setUp();
@@ -47,10 +50,10 @@ public class ZipDeflaterDataFormatFileDeleteTest extends CamelTestSupport {
oneExchangeDone.matchesWaitTime();
File in = new File("target/data/zip/hello.txt");
- Assert.assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/data/zip/out/hello.txt.zip");
- Assert.assertTrue("Should have been created " + out, out.exists());
+ assertTrue(out.exists(), "Should have been created " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java
index 5c6daef..b445ddd 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java
@@ -21,14 +21,17 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class ZipDeflaterDataFormatFileUnmarshalDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/zip");
super.setUp();
@@ -46,10 +49,10 @@ public class ZipDeflaterDataFormatFileUnmarshalDeleteTest extends CamelTestSuppo
event.matchesMockWaitTime();
File in = new File("target/zip/hello.txt");
- assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/zip/out/hello.txt.zip");
- assertFalse("Should have been deleted " + out, out.exists());
+ assertFalse(out.exists(), "Should have been deleted " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java
index 67096b3..5246186 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java
@@ -29,8 +29,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.stream.InputStreamCache;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Unit test of the zip data format.
[camel] 27/43: [CAMEL-11807] Upgrade camel-gson to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b417995203c9709b96e546f8d52cdb8808f3f675
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:02:00 2020 +0200
[CAMEL-11807] Upgrade camel-gson to junit5
---
components/camel-gson/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-gson/pom.xml b/components/camel-gson/pom.xml
index 5e58ec5..b31a34a 100644
--- a/components/camel-gson/pom.xml
+++ b/components/camel-gson/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 19/43: [CAMEL-11807] Upgrade camel-azure-storage-blob to
junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8838f18f203f6479d0e842a709151002a6b70ee9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:52:40 2020 +0200
[CAMEL-11807] Upgrade camel-azure-storage-blob to junit5
---
components/camel-azure-storage-blob/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-azure-storage-blob/pom.xml b/components/camel-azure-storage-blob/pom.xml
index c68162c..83b7380 100644
--- a/components/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure-storage-blob/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 29/43: [CAMEL-11807] Upgrade camel-msv to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f017c8cc1e308cc6e411cdcd89453a772b06dc11
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:04:59 2020 +0200
[CAMEL-11807] Upgrade camel-msv to junit5
---
components/camel-msv/pom.xml | 2 +-
.../org/apache/camel/component/validator/msv/RelaxNGRouteTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index 40c518c..f60b82f 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -59,7 +59,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-msv/src/test/java/org/apache/camel/component/validator/msv/RelaxNGRouteTest.java b/components/camel-msv/src/test/java/org/apache/camel/component/validator/msv/RelaxNGRouteTest.java
index b732907..2e00b68 100644
--- a/components/camel-msv/src/test/java/org/apache/camel/component/validator/msv/RelaxNGRouteTest.java
+++ b/components/camel-msv/src/test/java/org/apache/camel/component/validator/msv/RelaxNGRouteTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.validator.msv;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class RelaxNGRouteTest extends CamelSpringTestSupport {
[camel] 36/43: [CAMEL-11807] Upgrade camel-jbpm to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d569ae078bb65465655e0f4ca19a75eabab6f922
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 14:33:36 2020 +0200
[CAMEL-11807] Upgrade camel-jbpm to junit5
---
.../camel/component/jbpm/server/CamelKieServerExtensionTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
index c20c06b..707096e 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
@@ -41,9 +41,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
[camel] 40/43: [CAMEL-11807] Upgrade camel-kafka to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e83ec8418f09cc127da8c1fa6c5c572314f037b8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:12:57 2020 +0200
[CAMEL-11807] Upgrade camel-kafka to junit5
---
.../camel/component/kafka/KafkaEndpointTest.java | 10 ++++----
.../camel/component/kafka/KafkaProducerTest.java | 30 +++++++++++-----------
.../serde/DefaultKafkaHeaderDeserializerTest.java | 4 +--
.../serde/DefaultKafkaHeaderSerializerTest.java | 2 +-
.../kafka/clients/consumer/KafkaConsumerTest.java | 2 +-
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
index 7bfb0df..fdad9a9 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
@@ -24,14 +24,14 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
-@ExtendWith(MockitoExtension.class)
+@MockitoSettings
public class KafkaEndpointTest {
private KafkaEndpoint endpoint;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
index be5df93..9c45eea 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
@@ -47,11 +47,11 @@ import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isA;
@@ -401,15 +401,15 @@ public class KafkaProducerTest {
private void assertRecordMetadataExists() {
List<RecordMetadata> recordMetaData1 = (List<RecordMetadata>)in.getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData1 != null);
- assertEquals("Expected one recordMetaData", recordMetaData1.size(), 1);
- assertTrue(recordMetaData1.get(0) != null);
+ assertNotNull(recordMetaData1);
+ assertEquals(recordMetaData1.size(), 1, "Expected one recordMetaData");
+ assertNotNull(recordMetaData1.get(0));
}
private void assertRecordMetadataExists(final int numMetadata) {
List<RecordMetadata> recordMetaData1 = (List<RecordMetadata>)in.getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData1 != null);
- assertEquals("Expected one recordMetaData", recordMetaData1.size(), numMetadata);
+ assertNotNull(recordMetaData1);
+ assertEquals(recordMetaData1.size(), numMetadata, "Expected one recordMetaData");
assertTrue(recordMetaData1.get(0) != null);
}
@@ -417,9 +417,9 @@ public class KafkaProducerTest {
List<Exchange> exchanges = (List<Exchange>)in.getBody();
for (Exchange ex : exchanges) {
List<RecordMetadata> recordMetaData = (List<RecordMetadata>)ex.getMessage().getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData != null);
- assertEquals("Expected one recordMetaData", recordMetaData.size(), 1);
- assertTrue(recordMetaData.get(0) != null);
+ assertNotNull(recordMetaData);
+ assertEquals(recordMetaData.size(), 1, "Expected one recordMetaData");
+ assertNotNull(recordMetaData.get(0));
}
}
@@ -427,9 +427,9 @@ public class KafkaProducerTest {
List<Message> messages = (List<Message>)in.getBody();
for (Message msg : messages) {
List<RecordMetadata> recordMetaData = (List<RecordMetadata>)msg.getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData != null);
- assertEquals("Expected one recordMetaData", recordMetaData.size(), 1);
- assertTrue(recordMetaData.get(0) != null);
+ assertNotNull(recordMetaData);
+ assertEquals(recordMetaData.size(), 1, "Expected one recordMetaData");
+ assertNotNull(recordMetaData.get(0));
}
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java
index b54959d..9ed4e60 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.kafka.serde;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
public class DefaultKafkaHeaderDeserializerTest {
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java
index 9962302..2865c00 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
public class DefaultKafkaHeaderSerializerTest {
diff --git a/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
index 41c42b8..00b252f 100644
--- a/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
[camel] 18/43: [CAMEL-11807] Upgrade camel-lzf to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit faf4003c34c53697a4c4afebffd2bc62c929decf
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:50:16 2020 +0200
[CAMEL-11807] Upgrade camel-lzf to junit5
---
components/camel-lzf/pom.xml | 2 +-
.../java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
index b0e9078..1420ad8 100644
--- a/components/camel-lzf/pom.xml
+++ b/components/camel-lzf/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java b/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java
index 4ef43ee..991edca 100644
--- a/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java
+++ b/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LZFDataFormatTest extends CamelTestSupport {
private static final String TEXT = "Hamlet by William Shakespeare\n"
@@ -41,7 +43,7 @@ public class LZFDataFormatTest extends CamelTestSupport {
InputStream stream = new LZFInputStream(new ByteArrayInputStream(output));
String result = IOConverter.toString(stream, null);
- assertEquals("Uncompressed something different than compressed", TEXT, result);
+ assertEquals(TEXT, result, "Uncompressed something different than compressed");
}
@Test
[camel] 39/43: [CAMEL-11807] Upgrade camel-zipfile to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 37c7e5cb99fe77120a28f4d906d5a3a1cf7f1ae8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:11:21 2020 +0200
[CAMEL-11807] Upgrade camel-zipfile to junit5
---
.../camel/dataformat/zipfile/SpringZipSplitterRouteTest.java | 2 +-
.../camel/dataformat/zipfile/ZipFileDataFormatTest.java | 11 +++++++----
.../dataformat/zipfile/ZipFileIteratorDataFormatTest.java | 2 +-
.../dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java | 2 +-
.../camel/dataformat/zipfile/ZipFileSplitOneFileTest.java | 2 +-
.../camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java | 2 +-
.../apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java | 2 +-
.../zipfile/AggregationStrategyWithFilenameHeaderTest.java | 6 ++++--
.../zipfile/AggregationStrategyWithPreservationTest.java | 6 ++++--
.../zipfile/ZipAggregationStrategyEmptyFileTest.java | 6 ++++--
.../aggregate/zipfile/ZipAggregationStrategyTest.java | 6 ++++--
12 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java
index f5d3974..2c90f5c 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.dataformat.zipfile;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
-import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringZipSplitterRouteTest extends CamelSpringTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
index f2817fa..5885e8c 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
@@ -42,13 +42,16 @@ import org.apache.camel.converter.stream.InputStreamCache;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
+import static org.apache.camel.Exchange.FILE_NAME;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
-import static org.junit.jupiter.api.Assertions.*;
-
-import static org.apache.camel.Exchange.FILE_NAME;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit tests for {@link ZipFileDataFormat}.
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 8f75453..cb8c852 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
@@ -23,7 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class ZipFileIteratorDataFormatTest extends CamelTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
index 2120667..2b42026 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
@@ -22,7 +22,7 @@ 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.*; import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class ZipFileMultipleFilesSplitterTest extends ZipSplitterRouteTest {
static final String PROCESSED_FILES_HEADER_NAME = "processedFiles";
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java
index 62e601e..0912714 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
index 6aabea2..35136bc 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java
index 5de29ae..9fac583 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java
@@ -21,7 +21,7 @@ import java.io.File;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
index 2f30f4b2..834196a 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.dataformat.zipfile;
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.*; import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class ZipSplitterRouteTest extends CamelTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java
index f52dacc..4178c30 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java
@@ -29,10 +29,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
index b8e1b54..1ecab94 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
@@ -29,10 +29,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java
index 47b5e18..6808d5a 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java
@@ -26,10 +26,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ZipAggregationStrategyEmptyFileTest extends CamelTestSupport {
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
index 60fdbcc..289f253 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
@@ -26,10 +26,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ZipAggregationStrategyTest extends CamelTestSupport {
[camel] 02/43: [CAMEL-11807] Upgrade camel-xj to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a22c39f39e8ed76f19958b2f76ed6004593bf155
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 10:26:30 2020 +0200
[CAMEL-11807] Upgrade camel-xj to junit5
---
components/camel-xj/pom.xml | 2 +-
.../test/java/org/apache/camel/component/xj/J2XInputStreamTest.java | 4 ++--
.../test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java | 4 ++--
.../test/java/org/apache/camel/component/xj/J2XOutputFileTest.java | 4 ++--
.../java/org/apache/camel/component/xj/J2XOutputIdentityTest.java | 4 ++--
.../test/java/org/apache/camel/component/xj/J2XOutputStringTest.java | 4 ++--
.../java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java | 2 +-
.../test/java/org/apache/camel/component/xj/X2JInputStreamTest.java | 4 ++--
.../test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java | 4 ++--
.../test/java/org/apache/camel/component/xj/X2JOutputFileTest.java | 4 ++--
.../java/org/apache/camel/component/xj/X2JOutputIdentityTest.java | 4 ++--
.../test/java/org/apache/camel/component/xj/X2JOutputStringTest.java | 4 ++--
.../src/test/java/org/apache/camel/component/xj/XJTestUtils.java | 5 +++--
.../java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java | 2 +-
14 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/components/camel-xj/pom.xml b/components/camel-xj/pom.xml
index dd815ea..43bb6cd 100644
--- a/components/camel-xj/pom.xml
+++ b/components/camel-xj/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java
index 519d16e..0429c33 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java
@@ -22,8 +22,8 @@ import java.nio.charset.StandardCharsets;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class J2XInputStreamTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java
index 0e041d9..151504b 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.xj;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class J2XOutputBytesTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java
index 7195b8e..17ffd4e 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class J2XOutputFileTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java
index f9d7d62..405856c 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.xj;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class J2XOutputIdentityTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java
index 280009f..0f6c794 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.xj;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class J2XOutputStringTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java
index c82b28a..bc594cb 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.xj;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JsonXmlStreamReaderTest {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java
index 503fe99..4dfc239 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java
@@ -22,8 +22,8 @@ import java.nio.charset.StandardCharsets;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class X2JInputStreamTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java
index fa603df..a138a3a 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.xj;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class X2JOutputBytesTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java
index 84aae4a..22d514d 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class X2JOutputFileTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java
index 5a280c8..d5758c9 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.xj;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class X2JOutputIdentityTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java
index 088a151..930d1dc 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.xj;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class X2JOutputStringTest extends CamelTestSupport {
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java
index ac1717b..e1568a8 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java
@@ -42,12 +42,13 @@ import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
import org.skyscreamer.jsonassert.JSONAssert;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.builder.Input;
import org.xmlunit.diff.Diff;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
final class XJTestUtils {
private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance();
@@ -178,6 +179,6 @@ final class XJTestUtils {
.checkForIdentical()
.build();
- Assert.assertFalse("\nExpected: " + expected + "\n\nGot: " + result + "\n\nDiff: " + diff.toString(), diff.hasDifferences());
+ assertFalse(diff.hasDifferences(), "\nExpected: " + expected + "\n\nGot: " + result + "\n\nDiff: " + diff.toString());
}
}
diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java
index 8c930ce..2a824e1 100644
--- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java
+++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.xj;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class XmlJsonStreamWriterTest {
[camel] 28/43: [CAMEL-11807] Upgrade camel-jing to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c834a1a38e427ef7046acb094a63255dbfa04827
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:03:02 2020 +0200
[CAMEL-11807] Upgrade camel-jing to junit5
---
components/camel-jing/pom.xml | 6 +++---
.../org/apache/camel/component/validator/jing/RNCRouteTest.java | 4 ++--
.../org/apache/camel/component/validator/jing/RNGRouteTest.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-jing/pom.xml b/components/camel-jing/pom.xml
index a2682f3..c0db1db 100644
--- a/components/camel-jing/pom.xml
+++ b/components/camel-jing/pom.xml
@@ -49,13 +49,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNCRouteTest.java b/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNCRouteTest.java
index 3d1aebd..5905037 100644
--- a/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNCRouteTest.java
+++ b/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNCRouteTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.validator.jing;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class RNCRouteTest extends CamelSpringTestSupport {
diff --git a/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNGRouteTest.java b/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNGRouteTest.java
index ffa3a79..558d33c 100644
--- a/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNGRouteTest.java
+++ b/components/camel-jing/src/test/java/org/apache/camel/component/validator/jing/RNGRouteTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.validator.jing;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class RNGRouteTest extends CamelSpringTestSupport {
[camel] 15/43: [CAMEL-11807] Upgrade camel-printer to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94589577728be36939821c86da31a51c68e33cf6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:42:39 2020 +0200
[CAMEL-11807] Upgrade camel-printer to junit5
---
components/camel-printer/pom.xml | 8 ++---
.../camel/component/printer/PrinterPrintTest.java | 35 ++++++++++++----------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml
index da6807d..5891863 100644
--- a/components/camel-printer/pom.xml
+++ b/components/camel-printer/pom.xml
@@ -44,17 +44,17 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
index 7710ec8..dcad8bb 100644
--- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
+++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
@@ -38,12 +38,15 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -52,7 +55,7 @@ import static org.mockito.Mockito.when;
public class PrinterPrintTest extends CamelTestSupport {
- @Before
+ @BeforeEach
public void setup() {
setupJavaPrint();
}
@@ -132,7 +135,7 @@ public class PrinterPrintTest extends CamelTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testSendingFileToPrinter() throws Exception {
if (isAwtHeadless()) {
return;
@@ -149,7 +152,7 @@ public class PrinterPrintTest extends CamelTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testSendingGIFToPrinter() throws Exception {
if (isAwtHeadless()) {
return;
@@ -166,7 +169,7 @@ public class PrinterPrintTest extends CamelTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testSendingJPEGToPrinter() throws Exception {
if (isAwtHeadless()) {
return;
@@ -183,7 +186,7 @@ public class PrinterPrintTest extends CamelTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testSendingJPEGToPrinterWithLandscapePageOrientation() throws Exception {
if (isAwtHeadless()) {
return;
@@ -205,7 +208,7 @@ public class PrinterPrintTest extends CamelTestSupport {
* default values when starting the route.
*/
@Test
- @Ignore
+ @Disabled
public void testDefaultPrinterConfiguration() throws Exception {
if (isAwtHeadless()) {
return;
@@ -234,11 +237,11 @@ public class PrinterPrintTest extends CamelTestSupport {
PrintService ps2 = mock(PrintService.class);
when(ps2.getName()).thenReturn("printer2");
boolean res1 = PrintServiceLookup.registerService(ps1);
- assertTrue("PrintService #1 should be registered.", res1);
+ assertTrue(res1, "PrintService #1 should be registered.");
boolean res2 = PrintServiceLookup.registerService(ps2);
- assertTrue("PrintService #2 should be registered.", res2);
+ assertTrue(res2, "PrintService #2 should be registered.");
PrintService[] pss = PrintServiceLookup.lookupPrintServices(null, null);
- assertEquals("lookup should report two PrintServices.", numberOfPrintservicesBefore + 2, pss.length);
+ assertEquals(numberOfPrintservicesBefore + 2, pss.length, "lookup should report two PrintServices.");
DocPrintJob job1 = mock(DocPrintJob.class);
when(ps1.createPrintJob()).thenReturn(job1);
@@ -254,7 +257,7 @@ public class PrinterPrintTest extends CamelTestSupport {
// Are there two different PrintConfigurations?
Map<String, Endpoint> epm = context().getEndpointMap();
- assertEquals("Four endpoints", 4, epm.size());
+ assertEquals(4, epm.size(), "Four endpoints");
Endpoint lp1 = null;
Endpoint lp2 = null;
for (Map.Entry<String, Endpoint> ep : epm.entrySet()) {
@@ -287,7 +290,7 @@ public class PrinterPrintTest extends CamelTestSupport {
when(ps1.getName()).thenReturn("MyPrinter\\\\remote\\printer1");
when(ps1.isDocFlavorSupported(any(DocFlavor.class))).thenReturn(Boolean.TRUE);
boolean res1 = PrintServiceLookup.registerService(ps1);
- assertTrue("The Remote PrintService #1 should be registered.", res1);
+ assertTrue(res1, "The Remote PrintService #1 should be registered.");
DocPrintJob job1 = mock(DocPrintJob.class);
when(ps1.createPrintJob()).thenReturn(job1);
@@ -317,7 +320,7 @@ public class PrinterPrintTest extends CamelTestSupport {
when(ps1.getName()).thenReturn("printer1");
when(ps1.isDocFlavorSupported(any(DocFlavor.class))).thenReturn(Boolean.TRUE);
boolean res1 = PrintServiceLookup.registerService(ps1);
- assertTrue("The Remote PrintService #1 should be registered.", res1);
+ assertTrue(res1, "The Remote PrintService #1 should be registered.");
DocPrintJob job1 = mock(DocPrintJob.class);
when(ps1.createPrintJob()).thenReturn(job1);
[camel] 22/43: [CAMEL-11807] Upgrade camel-atmosphere-websocket to
junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2edfd34ea5060b69dcc5ff81a4c69f3de08d31e6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:57:42 2020 +0200
[CAMEL-11807] Upgrade camel-atmosphere-websocket to junit5
---
components/camel-atmosphere-websocket/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 35d57f6..42cd358 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
[camel] 33/43: [CAMEL-11807] Upgrade camel-ftp to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f079aef88fbfbf60b524f864c97be8a7ca27347c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:47:39 2020 +0200
[CAMEL-11807] Upgrade camel-ftp to junit5
---
components/camel-ftp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 715c050..136086d 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 24/43: [CAMEL-11807] Upgrade camel-cxf-transport to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 61f7f3c38112ad26727917faa2ea118590c40a0f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:58:46 2020 +0200
[CAMEL-11807] Upgrade camel-cxf-transport to junit5
---
components/camel-cxf-transport/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index cde71bf..49bdb3e 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -124,7 +124,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
[camel] 42/43: [CAMEL-11807] Upgrade camel-threadpoolfactory-vertx
to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 267d51d56803b879a38721827660e8d9fecebc58
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:52:30 2020 +0200
[CAMEL-11807] Upgrade camel-threadpoolfactory-vertx to junit5
---
components/camel-threadpoolfactory-vertx/pom.xml | 6 +++---
.../org/apache/camel/reactive/SplitCustomThreadPoolTest.java | 9 +++++----
.../org/apache/camel/reactive/SplitParallelLookupVertxTest.java | 9 +++++----
.../test/java/org/apache/camel/reactive/SplitParallelTest.java | 9 +++++----
4 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/components/camel-threadpoolfactory-vertx/pom.xml b/components/camel-threadpoolfactory-vertx/pom.xml
index 45fde68..6c6552d 100644
--- a/components/camel-threadpoolfactory-vertx/pom.xml
+++ b/components/camel-threadpoolfactory-vertx/pom.xml
@@ -54,7 +54,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -68,8 +68,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java
index 2888df0..a3639af 100644
--- a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java
+++ b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitCustomThreadPoolTest.java
@@ -21,9 +21,10 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.builder.ThreadPoolProfileBuilder;
import org.apache.camel.reactive.vertx.VertXThreadPoolFactory;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SplitCustomThreadPoolTest extends CamelTestSupport {
@@ -67,7 +68,7 @@ public class SplitCustomThreadPoolTest extends CamelTestSupport {
.to("log:bar")
.process(e -> {
String name = Thread.currentThread().getName();
- Assert.assertTrue("Should use Camel thread", name.startsWith("Camel"));
+ assertTrue(name.startsWith("Camel"), "Should use Camel thread");
})
.to("mock:split")
.end()
diff --git a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java
index 39ec41f..5972a17 100644
--- a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java
+++ b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelLookupVertxTest.java
@@ -19,9 +19,10 @@ package org.apache.camel.reactive;
import io.vertx.core.Vertx;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SplitParallelLookupVertxTest extends CamelTestSupport {
@@ -57,7 +58,7 @@ public class SplitParallelLookupVertxTest extends CamelTestSupport {
.to("log:bar")
.process(e -> {
String name = Thread.currentThread().getName();
- Assert.assertTrue("Should use vertx thread", name.startsWith("vert.x-worker-thread"));
+ assertTrue(name.startsWith("vert.x-worker-thread"), "Should use vertx thread");
})
.to("mock:split")
.end()
diff --git a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java
index 30dacdf..a5b3eef 100644
--- a/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java
+++ b/components/camel-threadpoolfactory-vertx/src/test/java/org/apache/camel/reactive/SplitParallelTest.java
@@ -20,9 +20,10 @@ import io.vertx.core.Vertx;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.reactive.vertx.VertXThreadPoolFactory;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SplitParallelTest extends CamelTestSupport {
@@ -61,7 +62,7 @@ public class SplitParallelTest extends CamelTestSupport {
.to("log:bar")
.process(e -> {
String name = Thread.currentThread().getName();
- Assert.assertTrue("Should use vertx thread", name.startsWith("vert.x-worker-thread"));
+ assertTrue(name.startsWith("vert.x-worker-thread"), "Should use vertx thread");
})
.to("mock:split")
.end()
[camel] 16/43: [CAMEL-11807] Upgrade camel-resilience4j to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 109f0510c9c56dc211a775746a5bad1087b42694
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:45:08 2020 +0200
[CAMEL-11807] Upgrade camel-resilience4j to junit5
---
components/camel-resilience4j/pom.xml | 2 +-
.../ResilienceExistingCircuitBreakerTest.java | 7 +++++--
.../resilience4j/ResilienceInheritErrorHandlerTest.java | 4 ++--
.../component/resilience4j/ResilienceManagementTest.java | 6 ++++--
.../resilience4j/ResilienceRouteBulkheadFallbackTest.java | 4 ++--
.../resilience4j/ResilienceRouteBulkheadOkTest.java | 4 ++--
.../resilience4j/ResilienceRouteFallbackTest.java | 4 ++--
.../ResilienceRouteFallbackViaNetworkTest.java | 8 ++++++--
.../component/resilience4j/ResilienceRouteOkTest.java | 6 ++++--
.../resilience4j/ResilienceRouteRejectedTest.java | 6 ++++--
.../component/resilience4j/ResilienceTimeoutTest.java | 12 ++++++++++--
.../resilience4j/ResilienceTimeoutThreadPoolTest.java | 15 +++++++++++++--
.../resilience4j/ResilienceTimeoutWithFallbackTest.java | 6 ++++--
.../resilience4j/SpringResilienceRouteFallbackTest.java | 4 ++--
.../resilience4j/SpringResilienceRouteOkTest.java | 4 ++--
15 files changed, 63 insertions(+), 29 deletions(-)
diff --git a/components/camel-resilience4j/pom.xml b/components/camel-resilience4j/pom.xml
index 3be4102..3554cae 100644
--- a/components/camel-resilience4j/pom.xml
+++ b/components/camel-resilience4j/pom.xml
@@ -79,7 +79,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java
index be25d08..3c7169d 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceExistingCircuitBreakerTest.java
@@ -20,8 +20,11 @@ import io.github.resilience4j.circuitbreaker.CircuitBreaker;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ResilienceExistingCircuitBreakerTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java
index 268379a..77972c8 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceInheritErrorHandlerTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.resilience4j;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class ResilienceInheritErrorHandlerTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java
index 1765709..5157b3c 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceManagementTest.java
@@ -20,8 +20,10 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ResilienceManagementTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java
index 3186bce..298c2ae 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadFallbackTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.resilience4j;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class ResilienceRouteBulkheadFallbackTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java
index c08467a..e45fcec 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteBulkheadOkTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.resilience4j;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class ResilienceRouteBulkheadOkTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java
index 1c4674e..d1972c6 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.resilience4j;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class ResilienceRouteFallbackTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java
index f093b1f..5ecb272 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteFallbackViaNetworkTest.java
@@ -17,8 +17,12 @@
package org.apache.camel.component.resilience4j;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class ResilienceRouteFallbackViaNetworkTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java
index e890e2a..b4b857e 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteOkTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ResilienceRouteOkTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java
index c5fcf8b..eeaa3a9 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceRouteRejectedTest.java
@@ -20,8 +20,10 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ResilienceRouteRejectedTest extends CamelTestSupport {
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java
index 8d8e888..f27a704 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java
@@ -20,14 +20,22 @@ import java.util.concurrent.TimeoutException;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Resilience using timeout with Java DSL
*/
public class ResilienceTimeoutTest extends CamelTestSupport {
+ protected Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testFast() throws Exception {
// this calls the fast route and therefore we get a response
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java
index 01c891d..8a01ce5 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java
@@ -23,14 +23,25 @@ import java.util.concurrent.TimeoutException;
import org.apache.camel.BindToRegistry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Resilience using timeout and custom thread pool with Java DSL
*/
public class ResilienceTimeoutThreadPoolTest extends CamelTestSupport {
+ protected Logger log = LoggerFactory.getLogger(getClass());
+
@BindToRegistry
public ExecutorService myThreadPool() {
return context().getExecutorServiceManager().newFixedThreadPool(this, "myThreadPool", 2);
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java
index 69da12e..44b9485 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutWithFallbackTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.resilience4j;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Resilience using timeout and fallback with Java DSL
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java
index 53bff6c..c5caf19 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteFallbackTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.resilience4j;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java
index 07313b3..48a4320 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/SpringResilienceRouteOkTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.resilience4j;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
[camel] 30/43: [CAMEL-11807] Upgrade camel-sap-netweaver to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d35e7ca61fbea7d458ee1b87d1bf02586fe672de
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 13:06:37 2020 +0200
[CAMEL-11807] Upgrade camel-sap-netweaver to junit5
---
components/camel-sap-netweaver/pom.xml | 2 +-
.../apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java | 4 ++--
.../component/sap/netweaver/NetWeaverFlightDataVelocityTest.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-sap-netweaver/pom.xml b/components/camel-sap-netweaver/pom.xml
index 742bf67..208ae01 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java
index a82853c..9764a7e 100644
--- a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java
+++ b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.sap.netweaver;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class NetWeaverFlightDataTest extends CamelTestSupport {
diff --git a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java
index 7a3e1ae..66a1cb5 100644
--- a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java
+++ b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataVelocityTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.sap.netweaver;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class NetWeaverFlightDataVelocityTest extends CamelTestSupport {
[camel] 04/43: [CAMEL-11807] Upgrade camel-xmpp to junit5
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ac9e3a15d35690d486db75afa337cc684ffad0f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 11:05:20 2020 +0200
[CAMEL-11807] Upgrade camel-xmpp to junit5
---
components/camel-xmpp/pom.xml | 2 +-
.../camel/component/xmpp/GoogleTalkTest.java | 10 +++---
.../camel/component/xmpp/UriConfigurationTest.java | 16 +++++----
.../component/xmpp/XmppDeferredConnectionTest.java | 12 +++----
.../component/xmpp/XmppMultiUserChatTest.java | 12 +++----
.../component/xmpp/XmppProducerConcurrentTest.java | 14 ++++----
.../component/xmpp/XmppRobustConnectionTest.java | 18 +++++-----
.../camel/component/xmpp/XmppRouteChatTest.java | 12 +++----
...ppRouteMultipleProducersSingleConsumerTest.java | 12 +++----
.../apache/camel/component/xmpp/XmppRouteTest.java | 39 ++++++++++------------
10 files changed, 74 insertions(+), 73 deletions(-)
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index 0712c16..a708184 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -75,7 +75,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
index 85606a6..2347e05 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.xmpp;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class GoogleTalkTest extends CamelTestSupport {
- @Ignore
+ @Disabled
@Test
public void testSendToGTalk() throws Exception {
// a disabled test... before enabling you must fill in your own gmail credentials in the route below
@@ -34,7 +34,7 @@ public class GoogleTalkTest extends CamelTestSupport {
result.assertIsSatisfied();
}
- @Ignore
+ @Disabled
@Test
public void testSendToGTalkWithSubject() throws Exception {
// a disabled test... before enabling you must fill in your own gmail credentials in the route below
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
index bf19e2f..a32178b 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
@@ -19,16 +19,18 @@ package org.apache.camel.component.xmpp;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class UriConfigurationTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class UriConfigurationTest {
protected CamelContext context = new DefaultCamelContext();
@Test
public void testPrivateChatConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@localhost:123/test-user@localhost?password=secret&serviceName=someCoolChat");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
@@ -43,7 +45,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testGroupChatConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@im.google.com:123?room=cheese&password=secret&nickname=incognito");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
@@ -61,7 +63,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testDefaultResource() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@im.google.com?password=secret");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
assertEquals("Camel", xmppEndpoint.getResource());
@@ -70,7 +72,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testPubSubConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@localhost:123?password=secret&pubsub=true");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
assertEquals("localhost", xmppEndpoint.getHost());
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
index a618436..69ad3d4 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
@@ -20,17 +20,17 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Test to verify that the XMPP producer and consumer will create deferred / lazy connections
* to the XMPP server when the server is not available upon route initialization. Also verify that
* these endpoints will then deliver messages as expected.
*/
-@Ignore("This test is not working at the moment")
+@Disabled("This test is not working at the moment")
public class XmppDeferredConnectionTest extends CamelTestSupport {
private EmbeddedXmppTestServer embeddedXmppTestServer;
@@ -119,7 +119,7 @@ public class XmppDeferredConnectionTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
index ce63be6..156e97e 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
@@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is not working at the moment")
+@Disabled("This test is not working at the moment")
public class XmppMultiUserChatTest extends CamelTestSupport {
protected MockEndpoint consumerEndpoint;
@@ -92,7 +92,7 @@ public class XmppMultiUserChatTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
index 8ff10cb..197460c 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
@@ -23,12 +23,14 @@ import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is not working at the moment")
+import static org.apache.camel.test.junit5.TestSupport.body;
+
+@Disabled("This test is not working at the moment")
public class XmppProducerConcurrentTest extends CamelTestSupport {
private EmbeddedXmppTestServer embeddedXmppTestServer;
@@ -90,7 +92,7 @@ public class XmppProducerConcurrentTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
index 65e920d..5adb28d 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
@@ -20,11 +20,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.isPlatform;
/**
* Test to verify that the XMPP consumer will reconnect when the connection is lost.
@@ -43,7 +45,7 @@ public class XmppRobustConnectionTest extends CamelTestSupport {
return registry;
}
- @Ignore("Since upgrade to smack 4.2.0 the robust connection handling doesn't seem to work, as consumerEndpoint below receives only 5 payloads instead of the expected 9")
+ @Disabled("Since upgrade to smack 4.2.0 the robust connection handling doesn't seem to work, as consumerEndpoint below receives only 5 payloads instead of the expected 9")
@Test
public void testXmppChatWithRobustConnection() throws Exception {
// does not work well on aix or solaris
@@ -112,14 +114,14 @@ public class XmppRobustConnectionTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
embeddedXmppTestServer = new EmbeddedXmppTestServer();
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
index 5ad9864..116d533 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
@@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is flaky on CI server")
+@Disabled("This test is flaky on CI server")
public class XmppRouteChatTest extends CamelTestSupport {
protected MockEndpoint consumerEndpoint;
@@ -101,7 +101,7 @@ public class XmppRouteChatTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
index e164d72..181c664 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
@@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is flaky on CI server")
+@Disabled("This test is flaky on CI server")
public class XmppRouteMultipleProducersSingleConsumerTest extends CamelTestSupport {
protected MockEndpoint goodEndpoint;
protected MockEndpoint badEndpoint;
@@ -104,7 +104,7 @@ public class XmppRouteMultipleProducersSingleConsumerTest extends CamelTestSuppo
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
index 54f3f3c..9223f68 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.xmpp;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -31,13 +28,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.engine.DefaultProducerTemplate;
import org.jivesoftware.smack.packet.Message;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore("Caused by: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target")
-public class XmppRouteTest extends TestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Disabled("Caused by: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target")
+public class XmppRouteTest {
protected static boolean enabled;
protected static String xmppUrl;
private static final Logger LOG = LoggerFactory.getLogger(XmppRouteTest.class);
@@ -48,21 +51,13 @@ public class XmppRouteTest extends TestCase {
protected ProducerTemplate client;
private EmbeddedXmppTestServer embeddedXmppTestServer;
- public static void main(String[] args) {
- enabled = true;
- if (args.length > 0) {
- xmppUrl = args[0];
- }
- TestRunner.run(XmppRouteTest.class);
- }
-
@Test
public void testXmppRouteWithTextMessage() throws Exception {
String expectedBody = "Hello there!";
sendExchange(expectedBody);
Object body = assertReceivedValidExchange();
- assertEquals("body", expectedBody, body);
+ assertEquals(expectedBody, body, "body");
}
protected void sendExchange(final Object expectedBody) {
@@ -82,7 +77,7 @@ public class XmppRouteTest extends TestCase {
assertNotNull(receivedExchange);
XmppMessage receivedMessage = (XmppMessage)receivedExchange.getIn();
- assertEquals("cheese header", 123, receivedMessage.getHeader("cheese"));
+ assertEquals(123, receivedMessage.getHeader("cheese"), "cheese header");
Object body = receivedMessage.getBody();
XmppRouteTest.LOG.debug("Received body: " + body);
Message xmppMessage = receivedMessage.getXmppMessage();
@@ -92,8 +87,8 @@ public class XmppRouteTest extends TestCase {
return body;
}
- @Override
- protected void setUp() throws Exception {
+ @BeforeEach
+ public void setUp() throws Exception {
client = new DefaultProducerTemplate(context);
String uriPrefix = getUriPrefix();
@@ -103,7 +98,7 @@ public class XmppRouteTest extends TestCase {
LOG.info("Using URI " + uri1 + " and " + uri2);
endpoint = context.getEndpoint(uri1);
- assertNotNull("No endpoint found!", endpoint);
+ assertNotNull(endpoint, "No endpoint found!");
// lets add some routes
context.addRoutes(new RouteBuilder() {
@@ -127,8 +122,8 @@ public class XmppRouteTest extends TestCase {
return "xmpp://localhost:" + embeddedXmppTestServer.getXmppPort() + "/camel?login=false&room=camel-anon";
}
- @Override
- protected void tearDown() throws Exception {
+ @AfterEach
+ public void tearDown() throws Exception {
client.stop();
context.stop();
embeddedXmppTestServer.stop();